diff options
| author | Andrey Kamaev <andrey.kamaev@itseez.com> | 2013-12-21 21:54:39 +0400 |
|---|---|---|
| committer | Andrey Kamaev <andrey.kamaev@itseez.com> | 2013-12-21 21:56:17 +0400 |
| commit | 3b523e440a4a5c046fce0383e263f6807382d64a (patch) | |
| tree | c0a771825090388b5eb453b27bfd590d5ceddc7f | |
| parent | 40ee56168ec1b23500ceefe0b0b1bface21f27df (diff) | |
| download | android-cmake-3b523e440a4a5c046fce0383e263f6807382d64a.tar.gz | |
Update for NDK r9c
Fixes #8
| -rw-r--r-- | android.toolchain.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android.toolchain.cmake b/android.toolchain.cmake index d349b0c..7f3d081 100644 --- a/android.toolchain.cmake +++ b/android.toolchain.cmake @@ -297,6 +297,8 @@ # [+] updated for NDK r9 # - November 2013 # [+] updated for NDK r9b +# - December 2013 +# [+] updated for NDK r9c # ------------------------------------------------------------------------------ cmake_minimum_required( VERSION 2.6.3 ) @@ -323,7 +325,7 @@ set( CMAKE_SYSTEM_VERSION 1 ) # rpath makes low sence for Android set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS) if( CMAKE_HOST_WIN32 ) file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) @@ -1735,7 +1737,7 @@ endif() # BUILD_WITH_STANDALONE_TOOLCHAIN : TRUE if standalone toolchain is used # ANDROID_NDK_HOST_SYSTEM_NAME : "windows", "linux-x86" or "darwin-x86" depending on host platform # ANDROID_NDK_ABI_NAME : "armeabi", "armeabi-v7a", "x86" or "mips" depending on ANDROID_ABI -# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b; set only for NDK +# ANDROID_NDK_RELEASE : one of r5, r5b, r5c, r6, r6b, r7, r7b, r7c, r8, r8b, r8c, r8d, r8e, r9, r9b, r9c; set only for NDK # ANDROID_ARCH_NAME : "arm" or "x86" or "mips" depending on ANDROID_ABI # ANDROID_SYSROOT : path to the compiler sysroot # TOOL_OS_SUFFIX : "" or ".exe" depending on host platform |