X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2FMakefile.cfg;h=113e65c8951a03a99bba14f72a7cccf4b73562fc;hb=9b09b24a5cc3dfb0cee51e0d1876c9253894666a;hp=a4346eb96f84a4c6dda19867f17dd4cafdae5abf;hpb=001546477549f71fd1af08e13c60e0a39397532a;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index a4346eb9..113e65c8 100644
--- a/Usermode/Libraries/Makefile.cfg
+++ b/Usermode/Libraries/Makefile.cfg
@@ -1,27 +1,40 @@
 # Acess 2 Libraries
 # General Makefile
 
--include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
+_libsdir := $(dir $(lastword $(MAKEFILE_LIST)))
+-include $(_libsdir)../Makefile.cfg
 
 MAKEDEP  = $(CC) -M
 
 ifeq ($(ARCHDIR),native)
-ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
-LDFLAGS := -lacess-native
-#CPPFLAGS := -D SoMain="__attribute__ ((constructor(101))) libacessnative_init"
+ ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
+ LDFLAGS := -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
 else
-CPPFLAGS := -ffreestanding
-CFLAGS   := -fno-stack-protector -fPIC
-LDFLAGS  := -I/Acess/Libs/ld-acess.so -lld-acess `$(CC) -print-libgcc-file-name`
+ CPPFLAGS := -ffreestanding
+ CFLAGS   := -fno-stack-protector -fPIC
+ CXXFLAGS   := -fno-stack-protector -fPIC
+ LDFLAGS  := -I/Acess/Libs/ld-acess.so -lld-acess `$(CC) -print-libgcc-file-name`
 endif
-CPPFLAGS += -I$(ACESSDIR)/Usermode/include/ -DARCHDIR=$(ARCHDIR) -DARCHDIR_is_$(ARCHDIR)=1
-CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
-CFLAGS += -Wall -g
-LDFLAGS += -g -nostdlib -shared -eSoMain -x --no-undefined -L$(OUTPUTDIR)Libs/
+LDFLAGS += -g -nostdlib -shared -eSoMain -x --no-undefined -L$(OUTPUTDIR)Libs/ --defsym __dso_handle=SoMain
+CXXFLAGS += -std=gnu++11
+
+-include $(_libsdir)../common_settings.mk
 
 # vim: ft=make