Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Linker flags for ELF based systems

Browse source
This commit is contained in:
Alexey Pelykh 2012-06-21 08:39:01 +03:00
parent 1a5f61cec4
commit fb1815c01d
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Osmand-kernel/Makefile.vars
View file

@ -11,7 +11,6 @@ ifeq ($(TARGET),)
endif endif
endif endif
############################################ ############################################
# Google NaCl target # Google NaCl target
ifeq ($(TARGET),nacl) ifeq ($(TARGET),nacl)
@ -33,7 +32,7 @@ ifeq ($(TARGET),nacl)
LDLIBS += -lppapi_cpp -lppapi LDLIBS += -lppapi_cpp -lppapi
GLOBAL_INCLUDES := -I../zlib/zlib_library -I$(NACL_TOOLCHAIN)/i686-nacl/usr/include GLOBAL_INCLUDES := -I../zlib/zlib_library -I$(NACL_TOOLCHAIN)/i686-nacl/usr/include
ZLIB_BUILD := defined ZLIB_BUILD := defined
CFLAGS += -D__int64="long long" -std=gnu++0x CFLAGS += -D__int64="long long"
CXXFLAGS += -D__int64="long long" -std=gnu++0x CXXFLAGS += -D__int64="long long" -std=gnu++0x
DYNAMICLIB_FLAGS := -shared DYNAMICLIB_FLAGS := -shared
############################################ ############################################
@ -102,7 +101,7 @@ $(error Set JAVA_HOME environment variable)
DYNAMICLIB_EXT := dll DYNAMICLIB_EXT := dll
LIBRARY_PREFIX := # empty LIBRARY_PREFIX := # empty
LDFLAGS += -Wl,--kill-at -static-libstdc++ -static-libgcc LDFLAGS += -Wl,--kill-at -static-libstdc++ -static-libgcc
CFLAGS += -std=gnu++0x CFLAGS += # empty
CXXFLAGS += -std=gnu++0x CXXFLAGS += -std=gnu++0x
DYNAMICLIB_FLAGS := -shared DYNAMICLIB_FLAGS := -shared
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
@ -116,8 +115,8 @@ $(error Set JAVA_HOME environment variable)
STATICLIB_EXT := a STATICLIB_EXT := a
DYNAMICLIB_EXT := so DYNAMICLIB_EXT := so
LIBRARY_PREFIX := lib LIBRARY_PREFIX := lib
DYNAMICLIB_FLAGS := -shared DYNAMICLIB_FLAGS := -shared -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new
CFLAGS += -std=gnu++0x CFLAGS += # empty
CXXFLAGS += -std=gnu++0x CXXFLAGS += -std=gnu++0x
endif endif

2
Osmand-kernel/osmand/Makefile
View file

@ -34,7 +34,7 @@ LIBTYPE = $(DYNAMICLIB_EXT)
ifeq ($(TARGET),darwin) ifeq ($(TARGET),darwin)
LDLIBS += --whole-archive -lskia --no-whole-archive -lproto -lft2 -lexpat -lpng -lz LDLIBS += --whole-archive -lskia --no-whole-archive -lproto -lft2 -lexpat -lpng -lz
else else
LDLIBS += -Wl,-Bsymbolic -Wl,--whole-archive -lskia -lpng -Wl,--no-whole-archive -lproto -lft2 -lexpat -lpng -lz LDLIBS += -Wl,--whole-archive -lskia -Wl,--no-whole-archive -lproto -lft2 -lexpat -lpng -lz
endif endif
ifeq ($(TARGET),windows) ifeq ($(TARGET),windows)