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

Cygwin JNI

Browse source
This commit is contained in:
Alexey Pelykh 2012-05-30 23:34:17 +03:00
parent 5640cb9d0b
commit a409860fa2
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Osmand-kernel/Makefile.vars
View file

@ -50,6 +50,8 @@ darwin_STRIP := strip -x
cygwin_CXX := i686-pc-cygwin-g++ cygwin_CXX := i686-pc-cygwin-g++
cygwin_CC := i686-pc-cygwin-gcc cygwin_CC := i686-pc-cygwin-gcc
cygwin_STRIP := i686-pc-cygwin-strip cygwin_STRIP := i686-pc-cygwin-strip
cygwin_LDFLAGS := -Wl,--kill-at
cygwin_CPP_FLAGS := -D__int64="long long" -D_JNI_IMPLEMENTATION -D_REENTRANT -D_GNU_SOURCE
win_CXX := i586-mingw32msvc-gcc win_CXX := i586-mingw32msvc-gcc
win_CC := i586-mingw32msvc-gcc win_CC := i586-mingw32msvc-gcc
@ -61,5 +63,5 @@ win_CPP_FLAGS := -D_Windows
CXX := $($(os)_CXX) CXX := $($(os)_CXX)
CC := $($(os)_CC) CC := $($(os)_CC)
STRIP := $($(os)_STRIP) STRIP := $($(os)_STRIP)
CPP_OS_FLAGS = $($(os)_CPP_FLAGS) CPP_OS_FLAGS := $($(os)_CPP_FLAGS)
#LINKFLAGS := $($(os)_LINKFLAGS) LDFLAGS := $($(os)_LDFLAGS)

7
Osmand-kernel/osmand/Makefile
View file

@ -10,7 +10,7 @@ RUNFILE := osmand_main
LOCAL_SRC_FILES += src/osmand_main.cpp LOCAL_SRC_FILES += src/osmand_main.cpp
#LDFLAGS = -Wl,--hash-style=both -fPIC #LDFLAGS = -Wl,--hash-style=both -fPIC
LDFLAGS = -Wall -fPIC -Wl,-Bsymbolic LDFLAGS := $(LDFLAGS) -Wall -fPIC -Wl,-Bsymbolic
#LDRUNFLAGS = -Wl,--hash-style=both #LDRUNFLAGS = -Wl,--hash-style=both
# --trace -Bsymbolic -Bsymbolic-functions # --trace -Bsymbolic -Bsymbolic-functions
@ -28,7 +28,7 @@ endif
ifeq ($(java_os),) ifeq ($(java_os),)
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
java_os := linux java_os := win32
endif endif
ifeq ($(findstring MINGW,$(shell uname)),MINGW) ifeq ($(findstring MINGW,$(shell uname)),MINGW)
java_os := win32 java_os := win32
@ -45,7 +45,8 @@ CPPFLAGS := \
-DGR_RELEASE=1 \ -DGR_RELEASE=1 \
-c -fPIC -I"$(FIXED_JAVA_HOME)/include" -I"$(FIXED_JAVA_HOME)/include/$(java_os)" \ -c -fPIC -I"$(FIXED_JAVA_HOME)/include" -I"$(FIXED_JAVA_HOME)/include/$(java_os)" \
-DHASH_MAP_GNU \ -DHASH_MAP_GNU \
$(C_INCLUDES) $(C_INCLUDES) \
$(CPP_OS_FLAGS)
#target : ../$(RUNFILE) #target : ../$(RUNFILE)
#target : $(PREBUILT_DIR)/$(LIBNAME) #target : $(PREBUILT_DIR)/$(LIBNAME)