X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=be17100fffd8f08f328445844ce62490fce7f4f2;hb=HEAD;hp=583ae5822596262c6bf586bebff073de644ca687;hpb=ce7b4832233f024983d7915f9c21cdd9b9fb4785;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 583ae582..be17100f 100644
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -5,29 +5,26 @@
 _appsdir := $(dir $(lastword $(MAKEFILE_LIST)))
 include $(_appsdir)../Makefile.cfg
 
-CXXFLAGS += -std=gnu++11
-
 ifeq ($(ARCHDIR),native)
  ASFLAGS = -felf
- CPPFLAGS = -Wall
- CFLAGS = $(CPPFLAGS)
- LDFLAGS = -L $(OUTPUTDIR)Libs -lacess-native -lc_acess
-#LIBGCC_PATH = $(ACESSDIR)/AcessNative/symbol_renames.ld
+ LDFLAGS :=
+ LIBS := -lacess-native -lc_acess
 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)
+ LDFLAGS :=
+ LIBS = -lld-acess
 endif
 
+LDFLAGS += -rpath-link $(OUTPUTDIR)Libs	# Needed so that dynamic libraries are linked correctly
+CXXFLAGS += -std=gnu++11
+CPPFLAGS +=
+CFLAGS   += -Wall
+
 -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
 
-CRTBEGIN = $(shell $(CC) $(CFLAGS) -print-file-name=crtbegin.o)
-CRTEND = $(shell $(CC) $(CFLAGS) -print-file-name=crtend.o)
-
 DIR = Bin
+
+# vim: ft=make