|
|
@@ -29,7 +29,7 @@
|
|
|
# POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
-# Android CMake toolchain file, for use with the Android NDK r5-r10e
|
|
|
+# Android CMake toolchain file, for use with the Android NDK r5-r11c
|
|
|
# Requires cmake 2.6.3 or newer (2.8.9 or newer is recommended).
|
|
|
# See home page: https://github.com/taka-no-me/android-cmake
|
|
|
#
|
|
|
@@ -224,7 +224,7 @@ set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" )
|
|
|
set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )
|
|
|
|
|
|
# NDK search paths
|
|
|
-set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r10e -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
|
|
|
+set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r11c -r11b -r11 -r10e -r10d -r10c -r10b -r10 -r9d -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 )
|
|
|
@@ -1743,7 +1743,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", "mips", "arm64-v8a", "x86_64", "mips64" depending on ANDROID_ABI
|
|
|
-# ANDROID_NDK_RELEASE : from r5 to r10e; set only for NDK
|
|
|
+# ANDROID_NDK_RELEASE : from r5 to r11c; set only for NDK
|
|
|
# ANDROID_NDK_RELEASE_NUM : numeric ANDROID_NDK_RELEASE version (1000*major+minor)
|
|
|
# ANDROID_ARCH_NAME : "arm", "x86", "mips", "arm64", "x86_64", "mips64" depending on ANDROID_ABI
|
|
|
# ANDROID_SYSROOT : path to the compiler sysroot
|
Yao Wei Tjong 姚伟忠