X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2FMakefile.cfg;h=b10117e493f67393d8063944a974a70d3e4b008c;hb=2238e69eea50d2274553926f3f294822c1972ff0;hp=9192194c14619aee4c09ff9264c6ae3eb6dc56f8;hpb=7681237dd0061c95dd4b22ca1b5c8c3c8b8fae2e;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index 9192194c..b10117e4 100644
--- a/Usermode/Libraries/Makefile.cfg
+++ b/Usermode/Libraries/Makefile.cfg
@@ -1,11 +1,45 @@
 # Acess 2 Libraries
 # General Makefile
 
--include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
+_libsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+-include $(_libsdir)../Makefile.cfg
 
+USE_CXX_LINK :=
+PRELINK :=
 MAKEDEP  = $(CC) -M
 
-ASFLAGS  += -D ARCHDIR=$(ARCHDIR)
-CPPFLAGS := -I$(ACESSDIR)/Usermode/include/ -D ARCHDIR=$(ARCHDIR) -D ARCHDIR_IS_$(ARCHDIR)=1
-CFLAGS   := -g -Wall -fPIC -fno-builtin -fno-stack-protector $(CPPFLAGS)
-LDFLAGS  := -g -nostdlib -shared -I/Acess/Libs/ld-acess.so -e SoMain -x -L$(OUTPUTDIR)Libs/
+ifeq ($(ARCHDIR),native)
+ ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
+ LDFLAGS := 
+ LIBS := -lacess-native
+ #CPPFLAGS := -D SoMain="__attribute__ ((constructor(101))) libacessnative_init"
+ ifeq ($(PLATFORM),windows)
+ else
+  LDFLAGS += -Wl,-init,SoMain
+  CFLAGS += -fPIC
+  CXXFLAGS += -fPIC
+ endif
+else ifneq ($(HOST_ARCH),)
+ ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
+ #CPPFLAGS := -D SoMain="__attribute__ ((constructor(101))) libacessnative_init"
+ LD := $(CC)
+ ifeq ($(PLATFORM),windows)
+ else
+  LDFLAGS += -Wl,-init,SoMain
+  CFLAGS += -fPIC
+  CXXFLAGS += -fPIC
+ endif
+ LIBS := -lld-acess
+else
+ CFLAGS   := -fno-stack-protector -fPIC
+ CXXFLAGS := -fno-stack-protector -fPIC
+ LDFLAGS  := 
+ LIBS := -lld-acess
+endif
+LDFLAGS += -g -shared -eSoStart -L$(OUTPUTDIR)Libs/ --no-undefined
+CXXFLAGS += -std=gnu++11
+#CPPFLAGS += -D 'SoMain(...)=SoMain(__VA_ARGS__) __attribute__ ((visibility ("hidden"))); int SoMain(__VA_ARGS__)'
+
+-include $(_libsdir)../common_settings.mk
+
+# vim: ft=make