X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=146177dd256f9312c2ff8e6da3ae5a81ef8738e7;hb=3045a1c5f05fa6f6e3cfe73da753b7500e87aff3;hp=f8cd1515a0532a89beab49b9d047ea50e00d13b5;hpb=9d3800f60f2212432e550a4e003ae65b498a4d36;p=tpg%2Facess2.git diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg index f8cd1515..146177dd 100644 --- a/Usermode/Applications/Makefile.cfg +++ b/Usermode/Applications/Makefile.cfg @@ -2,8 +2,13 @@ # General Makefile -include ../../../Makefile.cfg +# satisfying 2 deep applications +if $(ACESSDIR) == "" then + -include ../../../../Makefile.cfg +#endif +ACESSDIR := $(ACESSDIR)/Usermode ASFLAGS = -felf -CPPFLAGS = -I../../include/ +CPPFLAGS = -I$(ACESSDIR)/include/ CFLAGS = -fno-stack-protector $(CPPFLAGS) -LDFLAGS = -T ../../Libraries/acess.ld -I /Acess/Libs/ld-acess.so -lc +LDFLAGS = -T $(ACESSDIR)/Libraries/acess.ld -L $(ACESSDIR)/Libraries -I /Acess/Libs/ld-acess.so -lc