diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-08 02:28:21 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-09-08 02:28:21 -0500 |
| commit | d3a742eb38b71e172d9bf5cebbafcd811e1d3471 (patch) | |
| tree | 5d3c74e741cfd77160d8b04f3e102cce02d9e6c9 /Source/Android | |
| parent | dae162c2b5148d3f850f8a64a58c362b7d18e2ff (diff) | |
| parent | 707d21e36bf3e3282a992ef0a8e66256a2fdd242 (diff) | |
Merge pull request #1028 from Sonicadvance1/fix-android-cmake
Fix a few minor bugs that appeared in the latest android cmake script
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/android.toolchain.cmake | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Source/Android/android.toolchain.cmake b/Source/Android/android.toolchain.cmake index ba216c0740..9920fe6987 100644 --- a/Source/Android/android.toolchain.cmake +++ b/Source/Android/android.toolchain.cmake @@ -193,7 +193,7 @@ # LIBRARY_OUTPUT_PATH_ROOT should be set in cache to determine where Android # libraries will be installed. # Default is ${CMAKE_SOURCE_DIR}, and the android libs will always be -# under the ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME} +# under the ${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_OUTPUT_ABI_NAME} # (depending on the target ABI). This is convenient for Android packaging. # # Change Log: @@ -835,6 +835,12 @@ else() message( SEND_ERROR "Unknown ANDROID_ABI=\"${ANDROID_ABI}\" is specified." ) endif() +if( X86_64 ) + set( ANDROID_NDK_OUTPUT_ABI_NAME "x86-64" ) +else() + set( ANDROID_NDK_OUTPUT_ABI_NAME ${ANDROID_NDK_ABI_NAME} ) +endif() + if( CMAKE_BINARY_DIR AND EXISTS "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake" ) # really dirty hack # it is not possible to change CMAKE_SYSTEM_PROCESSOR after the first run... @@ -1255,9 +1261,9 @@ if( ANDROID_COMPILER_IS_CLANG ) endif() set( CMAKE_C_PLATFORM_ID Linux ) if( ARM64_V8A OR X86_64 OR MIPS64 ) - set( CMAKE_C_SIZEOF_DATA_PTR 4 ) -else() set( CMAKE_C_SIZEOF_DATA_PTR 8 ) +else() + set( CMAKE_C_SIZEOF_DATA_PTR 4 ) endif() set( CMAKE_C_HAS_ISYSROOT 1 ) set( CMAKE_C_COMPILER_ABI ELF ) @@ -1267,9 +1273,9 @@ if( ANDROID_COMPILER_IS_CLANG ) endif() set( CMAKE_CXX_PLATFORM_ID Linux ) if( ARM64_V8A OR X86_64 OR MIPS64 ) - set( CMAKE_CXX_SIZEOF_DATA_PTR 4 ) -else() set( CMAKE_CXX_SIZEOF_DATA_PTR 8 ) +else() + set( CMAKE_CXX_SIZEOF_DATA_PTR 4 ) endif() set( CMAKE_CXX_HAS_ISYSROOT 1 ) set( CMAKE_CXX_COMPILER_ABI ELF ) @@ -1608,11 +1614,11 @@ set( CMAKE_INSTALL_PREFIX "${ANDROID_TOOLCHAIN_ROOT}/user" CACHE STRING "path fo if(NOT _CMAKE_IN_TRY_COMPILE) if( EXISTS "${CMAKE_SOURCE_DIR}/jni/CMakeLists.txt" ) - set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_ABI_NAME}" CACHE PATH "Output directory for applications" ) + set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin/${ANDROID_NDK_OUTPUT_ABI_NAME}" CACHE PATH "Output directory for applications" ) else() set( EXECUTABLE_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/bin" CACHE PATH "Output directory for applications" ) endif() - set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_ABI_NAME}" CACHE PATH "path for android libs" ) + set( LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH_ROOT}/libs/${ANDROID_NDK_OUTPUT_ABI_NAME}" CACHE PATH "path for android libs" ) endif() # copy shaed stl library to build directory |