X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=a1a0141af4c82c9ab3ccc53a57e2756af49b6433;hb=855d69055d5c418b1129ce47b42c05f14c8e7119;hp=146177dd256f9312c2ff8e6da3ae5a81ef8738e7;hpb=466eda7c917791866a29c253c6c22197faf41bf7;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 146177dd..a1a0141a 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -1,14 +1,28 @@
 # Acess 2 Applications
 # General Makefile
 
--include ../../../Makefile.cfg
-# satisfying 2 deep applications
-if $(ACESSDIR) == "" then
-	-include ../../../../Makefile.cfg
-#endif
-ACESSDIR := $(ACESSDIR)/Usermode
-
-ASFLAGS = -felf
-CPPFLAGS = -I$(ACESSDIR)/include/
-CFLAGS   = -fno-stack-protector $(CPPFLAGS)
-LDFLAGS  = -T $(ACESSDIR)/Libraries/acess.ld -L $(ACESSDIR)/Libraries -I /Acess/Libs/ld-acess.so -lc
+# Include Usermode Makefile.cfg
+_appsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(_appsdir)../Makefile.cfg
+
+ifeq ($(ARCHDIR),native)
+ ASFLAGS = -felf
+ CPPFLAGS = -Wall
+ CFLAGS = $(CPPFLAGS)
+ LDFLAGS = -L $(OUTPUTDIR)Libs -lacess-native -lc_acess
+#LIBGCC_PATH = $(ACESSDIR)/AcessNative/symbol_renames.ld
+else
+ ASFLAGS = -felf
+ CPPFLAGS = -ffreestanding
+ CFLAGS   = -fno-stack-protector -fno-builtin $(CPPFLAGS) -Wall
+ LDFLAGS  = -T $(OUTPUTDIR)Libs/acess.ld -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc $(OUTPUTDIR)Libs/crtbegin.o $(OUTPUTDIR)Libs/crtend.o -lposix
+ LIBGCC_PATH = $(shell $(CC) -print-libgcc-file-name)
+endif
+
+-include $(_appsdir)../common_settings.mk
+LDFLAGS += -rpath-link $(OUTPUTDIR)Libs
+
+# Extra-verbose errors!
+#CFLAGS += -Wall -Wextra -Wwrite-strings -Wshadow -Wswitch-default -Wswitch-enum -Wstrict-overflow=5 -Wfloat-equal -Wundef -Wmissing-declarations -Wlogical-op  -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wsync-nand -Wunused -Wstrict-overflow=5 -Wfloat-equal -Wundef -Wno-endif-labels -Wshadow -Wunsafe-loop-optimizations -Wbad-function-cast -Wc++-compat -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-declarations -Wnormalized=nfc -Wpacked -Wpadded -Wredundant-decls -Wnested-externs -Winline -Winvalid-pch -Wdisabled-optimization -Woverlength-strings
+
+DIR = Bin