X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.cfg;h=be17100fffd8f08f328445844ce62490fce7f4f2;hb=e7d851ae8923947899ef3adc9980e93f4b8d7c4f;hp=72611452b1f97c3eacb904f8f7f99deb9d7f8e25;hpb=2bf08f0eb3461218cc493ef458fe100ae9158f28;p=tpg%2Facess2.git diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg index 72611452..be17100f 100644 --- a/Usermode/Applications/Makefile.cfg +++ b/Usermode/Applications/Makefile.cfg @@ -7,17 +7,15 @@ include $(_appsdir)../Makefile.cfg ifeq ($(ARCHDIR),native) ASFLAGS = -felf - LDFLAGS = -L $(OUTPUTDIR)Libs + LDFLAGS := 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 + LDFLAGS := LIBS = -lld-acess endif -LDFLAGS += -rpath-link $(OUTPUTDIR)Libs +LDFLAGS += -rpath-link $(OUTPUTDIR)Libs # Needed so that dynamic libraries are linked correctly CXXFLAGS += -std=gnu++11 CPPFLAGS += CFLAGS += -Wall @@ -28,3 +26,5 @@ CFLAGS += -Wall #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