X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=f87736c90ea29d171c34bf54c720ac96c546900e;hb=5b487e31cf5145372e9777e9f82a8cd661d4f1b4;hp=f8cd1515a0532a89beab49b9d047ea50e00d13b5;hpb=9d3800f60f2212432e550a4e003ae65b498a4d36;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index f8cd1515..f87736c9 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -1,9 +1,32 @@
 # Acess 2 Applications
 # General Makefile
 
--include ../../../Makefile.cfg
+# Include Usermode Makefile.cfg
+_appsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+include $(_appsdir)../Makefile.cfg
 
-ASFLAGS = -felf
-CPPFLAGS = -I../../include/
-CFLAGS   = -fno-stack-protector $(CPPFLAGS)
-LDFLAGS  = -T ../../Libraries/acess.ld -I /Acess/Libs/ld-acess.so -lc
+ifeq ($(ARCHDIR),native)
+ ASFLAGS = -felf
+ LDFLAGS = -L $(OUTPUTDIR)Libs
+ LIBS := -lacess-native -lc_acess
+#LIBGCC_PATH = $(ACESSDIR)/AcessNative/symbol_renames.ld
+else
+ ASFLAGS = -felf
+# LDFLAGS  = -T $(OUTPUTDIR)Libs/acess.ld
+ LDFLAGS  = -L $(OUTPUTDIR)Libs
+ LIBS = -lld-acess
+endif
+
+LDFLAGS += -rpath-link $(OUTPUTDIR)Libs
+CXXFLAGS += -std=gnu++11
+CPPFLAGS +=
+CFLAGS   += -Wall
+
+-include $(_appsdir)../common_settings.mk
+
+# 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
+
+# vim: ft=make