miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating with NDK r5: STLPort still does not compile

Browse Source
This commit is contained in:
pelya
2011-01-28 14:38:24 +00:00
parent 8418a37c02
commit 343458d9a6
37 changed files with 153 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/Android.mk
View File

@@ -7,10 +7,10 @@ endif
NDK_VERSION := $(strip $(patsubst android-ndk-%,%,$(filter android-ndk-%, $(subst /, ,$(dir $(TARGET_CC))))))
$(info NDK version $(NDK_VERSION))
ifneq ($(filter r1 r2 r3 r4, $(NDK_VERSION)),)
$(error Your NDK $(NDK_VERSION) is too old, please download NDK r4b from http://developer.android.com )
$(error Your NDK $(NDK_VERSION) is too old, please download NDK r4b or r5b from http://developer.android.com )
endif
ifneq ($(filter r5, $(NDK_VERSION)),)
$(error Your NDK $(NDK_VERSION) generates invalid code, please download NDK r4b from http://developer.android.com or wait for NDK r5b release. Details: http://groups.google.com/group/android-ndk/browse_thread/thread/6b35728eec7ef52f/b57f52776842041d )
$(error Your NDK $(NDK_VERSION) generates invalid code, please use NDK r4b or r5b from http://developer.android.com)
endif
@@ -18,7 +18,7 @@ ifneq ($(findstring -crystax,$(NDK_VERSION)),)
$(info Building with CrystaX toolchain - RTTI and exceptions enabled, STLPort disabled)
CRYSTAX_TOOLCHAIN = 1
endif
ifneq ($(findstring r5,$(NDK_VERSION)),)
ifneq ($(findstring r5b,$(NDK_VERSION)),)
$(info Building with NDK r5)
NDK_R5_TOOLCHAIN = 1
endif