X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.cfg;h=a9b0191942becaef6bd5e6c355d264d111020d4b;hb=d710f435ed0d2b804ea82dba2dd122c4d6e5d08d;hp=78e39fb91293fc19e31c8663af54a0a7234a46ee;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index 78e39fb9..a9b01919 100644
--- a/Usermode/Libraries/Makefile.cfg
+++ b/Usermode/Libraries/Makefile.cfg
@@ -1,11 +1,11 @@
 # Acess 2 Libraries
 # General Makefile
 
--include ../../../Makefile.cfg
+-include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
 
 MAKEDEP  = $(CC) -M
 
-ASFLAGS  = -felf
-CPPFLAGS = -I$(ACESSDIR)/Usermode/include/
-CFLAGS   = -g -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)
-LDFLAGS  = -g -nostdlib -shared -I/Acess/Libs/ld-acess.so -e SoMain -x -L.. -lacess
+ASFLAGS  += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
+CPPFLAGS := -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
+CFLAGS   := -g -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)
+LDFLAGS  := -g -nostdlib -shared -I/Acess/Libs/ld-acess.so -e SoMain -x -L$(OUTPUTDIR)Libs/