git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2
[tpg/acess2.git]
/
Usermode
/
Libraries
/
Makefile.cfg
diff --git
a/Usermode/Libraries/Makefile.cfg
b/Usermode/Libraries/Makefile.cfg
index
5920059
..
b10117e
100644
(file)
--- a/
Usermode/Libraries/Makefile.cfg
+++ b/
Usermode/Libraries/Makefile.cfg
@@
-4,11
+4,14
@@
_libsdir := $(dir $(lastword $(MAKEFILE_LIST)))
-include $(_libsdir)../Makefile.cfg
_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
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
#CPPFLAGS := -D SoMain="__attribute__ ((constructor(101))) libacessnative_init"
ifeq ($(PLATFORM),windows)
else
@@
-26,13
+29,16
@@
else ifneq ($(HOST_ARCH),)
CFLAGS += -fPIC
CXXFLAGS += -fPIC
endif
CFLAGS += -fPIC
CXXFLAGS += -fPIC
endif
+ LIBS := -lld-acess
else
else
- CPPFLAGS := -ffreestanding
CFLAGS := -fno-stack-protector -fPIC
CFLAGS := -fno-stack-protector -fPIC
- CXXFLAGS := -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
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
-include $(_libsdir)../common_settings.mk
UCC
git Repository :: git.ucc.asn.au