diff options
Diffstat (limited to 'Toolchain/i686-android.cmake')
| -rwxr-xr-x | Toolchain/i686-android.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake index 94c6197e5..2b6e8a177 100755 --- a/Toolchain/i686-android.cmake +++ b/Toolchain/i686-android.cmake @@ -5,8 +5,8 @@ set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version") set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version") set(ANDROID_ARCH "x86" CACHE STRING "Android architecture") -find_program(CMAKE_C_COMPILER NAMES i686-android-linux-gcc i686-android-linux-gcc.exe) -find_program(CMAKE_CXX_COMPILER NAMES i686-android-linux-g++ i686-android-linux-g++.exe) +find_program(CMAKE_C_COMPILER NAMES i686-linux-android-gcc i686-linux-android-gcc.exe) +find_program(CMAKE_CXX_COMPILER NAMES i686-linux-android-g++ i686-linux-android-g++.exe) set(PKG_CONFIG_EXECUTABLE "i686-android-pkg-config") get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH) @@ -16,7 +16,7 @@ set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-x86") set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR}) -set(CMAKE_REQUIRED_FLAGS "-nostdlib -lc -ldl -lgcc -L${NDK_ARCH_DIR}/usr/lib") +set(CMAKE_REQUIRED_FLAGS "-ldl --sysroot=${NDK_ARCH_DIR} ${EXTRA_COMPILER_FLAGS}") set(CMAKE_REQUIRED_INCLUDES "${NDK_ARCH_DIR}/usr/include") set(NAVIT_COMPILE_FLAGS "-I${NDK_ARCH_DIR}/usr/include -g -D_GNU_SOURCE -DANDROID -fno-short-enums ${CMAKE_REQUIRED_FLAGS}") |