diff options
| author | Alex Zolotarev <alex@mapswithme.com> | 2014-09-11 13:14:32 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:28:11 +0300 |
| commit | d62670e73e01bc96a07ddc14041979d823b1e62f (patch) | |
| tree | 0c3dbf789da6001154d73250d8629f2680266e4b /tools/mkspecs | |
| parent | 42515bbd209f5c038744a380247a1a88f4c9d5c4 (diff) | |
[android] Fixes to compile routing branch for Android
Diffstat (limited to 'tools/mkspecs')
| -rw-r--r-- | tools/mkspecs/android-clang/qmake.conf | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/mkspecs/android-clang/qmake.conf b/tools/mkspecs/android-clang/qmake.conf index 19a844e582..7a6e98c7f6 100644 --- a/tools/mkspecs/android-clang/qmake.conf +++ b/tools/mkspecs/android-clang/qmake.conf @@ -99,6 +99,7 @@ QMAKE_CFLAGS *= -Wa,--noexecstack -Wformat -Werror=format-security # in android-ndk/platforms/android-5/arch-arm/usr/include/locale.h QMAKE_CFLAGS *= -Wno-extern-c-compat -Wno-deprecated-register +QMAKE_CFLAGS *= --sysroot=$$PLATFORM_INCLUDE_PATH/../.. QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS -std=c++11 -fexceptions -frtti @@ -113,13 +114,15 @@ QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden # modifications to linux.conf QMAKE_AR = $$AR_FULL_PATH cqsD -#QMAKE_INCDIR = $$BASE_CXX_INCLUDE_PATH/libcxx/include -#QMAKE_INCDIR *= $$BASE_CXX_INCLUDE_PATH/../../android/support/include -#QMAKE_INCDIR *= $$ABI_INCLUDE_PATH +#ABI_INCLUDE_PATH = $$BASE_CXX_INCLUDE_PATH/../llvm-libc++abi/libcxxabi/include + +QMAKE_INCDIR = $$BASE_CXX_INCLUDE_PATH/libcxx/include +QMAKE_INCDIR *= $$ABI_INCLUDE_PATH +QMAKE_INCDIR *= $$BASE_CXX_INCLUDE_PATH/../../android/support/include QMAKE_INCDIR *= $$PLATFORM_INCLUDE_PATH -QMAKE_INCDIR *= $$BASE_GNUSTL_INCLUDE_PATH/include -QMAKE_INCDIR *= $$BASE_GNUSTL_INCLUDE_PATH/include/backward -QMAKE_INCDIR *= $$ABI_GNUSTL_INCLUDE_PATH +#QMAKE_INCDIR *= $$BASE_GNUSTL_INCLUDE_PATH/include +#QMAKE_INCDIR *= $$BASE_GNUSTL_INCLUDE_PATH/include/backward +#QMAKE_INCDIR *= $$ABI_GNUSTL_INCLUDE_PATH #QMAKE_LIBDIR = $$ANDROID_SOURCES_CXX_STL_LIBDIR $$ANDROID_PLATFORM_PATH/lib |