]>
Commit | Line | Data |
---|---|---|
7966c37c MC |
1 | --- android.toolchain.cmake.orig 2014-04-06 16:08:25.765699476 +0200 |
2 | +++ android.toolchain.cmake 2014-04-06 16:22:30.671987319 +0200 | |
3 | @@ -464,7 +464,7 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) | |
4 | else()\r | |
5 | execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" --version\r | |
6 | OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE )\r | |
7 | - string( REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" )\r | |
8 | + string( REGEX MATCH "[0-9]+(\\.[0-9]+)+" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" )\r | |
9 | endif()\r | |
10 | endif()\r | |
11 | \r | |
12 | @@ -667,7 +667,12 @@ endif() | |
13 | if( BUILD_WITH_STANDALONE_TOOLCHAIN )\r | |
14 | set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" )\r | |
15 | set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" )\r | |
16 | - set( __stlLibPath "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" )\r | |
17 | + if (NOT DEFINED ANDROID_STL_PATH)\r | |
18 | + set( __stlLibPath "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" )\r | |
19 | + else()\r | |
20 | + set( __stlIncludePath "${ANDROID_STL_PATH}/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/include" )\r | |
21 | + set( __stlLibPath "${ANDROID_STL_PATH}/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}" )\r | |
22 | + endif()\r | |
23 | endif()\r | |
24 | if( BUILD_WITH_ANDROID_NDK )\r | |
25 | set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_NAME}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )\r | |
26 | @@ -732,6 +737,9 @@ list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS | |
27 | if( __stlIncludePath AND EXISTS "${__stlIncludePath}" )\r | |
28 | list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS "${__stlIncludePath}" )\r | |
29 | endif()\r | |
30 | +if( __stlLibPath AND EXISTS "${__stlLibPath}/include" )\r | |
31 | + list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS "${__stlLibPath}/include" )\r | |
32 | +endif()\r | |
33 | \r | |
34 | # c++ bits includes\r | |
35 | if( __stlLibPath AND EXISTS "${__stlLibPath}/include" )\r |