Usermode - Fixed GAS/NASM detection

[tpg/acess2.git] / Usermode / Libraries / Makefile.cfg

diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index 159ab1e..a9b0191 100644 (file)
--- 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..
+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/