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

Added support for NDK r6b

Browse Source
This commit is contained in:
pelya
2011-10-10 18:16:34 +03:00
parent 63af8c0944
commit 7145c352a8
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
project/jni/Android.mk
View File

@@ -5,11 +5,11 @@ SDL_MIXER_USE_LIBMAD := 1
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)),)
#$(info NDK version $(NDK_VERSION)) # This warning puzzles ndk-gdb
ifneq ($(filter r1 r2 r3 r4,$(NDK_VERSION)),)
$(error Your NDK $(NDK_VERSION) is too old, please download NDK r4b, r5c or r6 from http://developer.android.com )
endif
ifneq ($(filter r5 r5b, $(NDK_VERSION)),)
ifneq ($(filter r5 r5b,$(NDK_VERSION)),)
$(error Your NDK $(NDK_VERSION) generates invalid code, please use NDK r5c from http://developer.android.com)
endif
ifeq ($(NDK_VERSION)-,-)
@@ -21,7 +21,11 @@ ifneq ($(findstring r4-crystax,$(NDK_VERSION)),)
$(info Building with CrystaX r4 toolchain - internal STLPort disabled)
CRYSTAX_TOOLCHAIN := 1
endif
ifneq ($(findstring r5c r6,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION)),)
ifneq ($(findstring r6b,$(NDK_VERSION))$(findstring r6-crystax,$(NDK_VERSION)),)
$(info Building with NDK r6)
NDK_R6_TOOLCHAIN := 1
endif
ifneq ($(findstring r5c,$(NDK_VERSION))$(findstring r5-crystax,$(NDK_VERSION))$(NDK_R6_TOOLCHAIN),)
$(info Building with NDK r5c or r6 - internal STLPort disabled)
NDK_R5_TOOLCHAIN := 1
endif