diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -515,6 +515,24 @@ QT_EXT_PREFIX= # default qpa platform # Android vars +if [ -z "$ANDROID_SDK_ROOT" ]; then + if [ "$UNAME_SYSTEM" = "Darwin" ] && [ -d "$HOME/Library/Android/sdk" ]; then + ANDROID_SDK_ROOT="$HOME/Library/Android/sdk" + elif [ "$UNAME_SYSTEM" = "Linux" ] && [ -d "$HOME/Android/Sdk" ]; then + ANDROID_SDK_ROOT="$HOME/Android/Sdk" + fi +fi + +if [ -z "$ANDROID_NDK_ROOT" ]; then + if [ -d "$ANDROID_SDK_ROOT/ndk-bundle" ]; then + ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle" + elif [ "$UNAME_SYSTEM" = "Darwin" ] && [ -d "$HOME/Library/Android/sdk/ndk-bundle" ]; then + ANDROID_NDK_ROOT="$HOME/Library/Android/sdk/ndk-bundle" + elif [ "$UNAME_SYSTEM" = "Linux" ] && [ -d "$HOME/Android/Sdk/ndk-bundle" ]; then + ANDROID_NDK_ROOT="$HOME/Android/Sdk/ndk-bundle" + fi +fi + CFG_DEFAULT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT CFG_DEFAULT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT CFG_DEFAULT_ANDROID_PLATFORM=android-16 @@ -1696,9 +1714,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; qfsfileengine_win.o \ qlocale_win.o \ qsettings_win.o \ + qoperatingsystemversion_win.o \ qsystemlibrary.o \ registry.o" EXTRA_SRCS="\"\$(SOURCE_PATH)/src/corelib/corelib/io/qfilesystemengine_win.cpp\" \ + \"\$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_win.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp\" \ @@ -1731,12 +1751,12 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_OBJS="$EXTRA_OBJS \ qsettings_mac.o \ qcore_mac.o \ - qcore_mac_objc.o \ + qoperatingsystemversion_darwin.o \ qcore_foundation.o" EXTRA_SRCS="$EXTRA_SRCS \ \"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \ \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \ - \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\" \ + \"\$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm\" \ \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm\"" fi |