X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.cfg;h=b10117e493f67393d8063944a974a70d3e4b008c;hb=5f8480455a9e2172b15dfc7fb96480a68506c30d;hp=4bb2c9974f4c8203886caec3b47b22d917e14a80;hpb=1be15cb14a9e03147190a9565461b7bf4ebdba35;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index 4bb2c997..b10117e4 100644
--- a/Usermode/Libraries/Makefile.cfg
+++ b/Usermode/Libraries/Makefile.cfg
@@ -4,23 +4,41 @@
 _libsdir := $(dir $(lastword $(MAKEFILE_LIST)))
 -include $(_libsdir)../Makefile.cfg
 
+USE_CXX_LINK :=
+PRELINK :=
 MAKEDEP  = $(CC) -M
 
 ifeq ($(ARCHDIR),native)
  ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
- LDFLAGS := -lacess-native
+ 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
- CPPFLAGS := -ffreestanding
  CFLAGS   := -fno-stack-protector -fPIC
- LDFLAGS  := -I/Acess/Libs/ld-acess.so -lld-acess `$(CC) -print-libgcc-file-name`
+ CXXFLAGS := -fno-stack-protector -fPIC
+ LDFLAGS  := 
+ LIBS := -lld-acess
 endif
-LDFLAGS += -g -nostdlib -shared -eSoMain -x --no-undefined -L$(OUTPUTDIR)Libs/
+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