From c9c9f2ec5c74dbf96388fe53b199dd6f6941d15c Mon Sep 17 00:00:00 2001 From: vng Date: Sun, 7 Jul 2013 01:28:59 +0300 Subject: [PATCH] [iOS] Compilation for iOS with QT5 toolchain. --- common.pri | 2 +- generator/generator_tests/generator_tests.pro | 2 +- generator/generator_tool/generator_tool.pro | 2 +- graphics/graphics_tests/graphics_tests.pro | 2 +- gui/gui_tests/gui_tests.pro | 2 +- indexer/indexer_tests/indexer_tests.pro | 2 +- map/benchmark_tool/benchmark_tool.pro | 2 +- map/map_tests/map_tests.pro | 2 +- map/mwm_tests/mwm_tests.pro | 2 +- platform/platform.pro | 6 +++--- platform/platform_tests/platform_tests.pro | 2 +- qt/qt.pro | 2 +- storage/storage_tests/storage_tests.pro | 2 +- tools/autobuild/build.sh | 2 +- tools/mkspecs/iphonesimulator-clang/qmake.conf | 2 +- tools/mkspecs/iphonesimulator-llvm/qmake.conf | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/common.pri b/common.pri index 74400828e8..cb666b833f 100644 --- a/common.pri +++ b/common.pri @@ -161,7 +161,7 @@ win32-g++ { QMAKE_LFLAGS_RELEASE *= -O } -macx* { +macx-* { # minimum supported Mac OS X version QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_CFLAGS *= -mmacosx-version-min=10.6 diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro index 307f225944..a9e39e2de4 100644 --- a/generator/generator_tests/generator_tests.pro +++ b/generator/generator_tests/generator_tests.pro @@ -14,7 +14,7 @@ win32 { LIBS *= -lShell32 win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" +macx-*: LIBS *= "-framework Foundation" HEADERS += \ diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro index e517ccd3e5..804af60aef 100644 --- a/generator/generator_tool/generator_tool.pro +++ b/generator/generator_tool/generator_tool.pro @@ -16,7 +16,7 @@ TEMPLATE = app QT *= core win32: LIBS *= -lShell32 -macx*: LIBS *= "-framework Foundation" +macx-*: LIBS *= "-framework Foundation" SOURCES += \ generator_tool.cpp \ diff --git a/graphics/graphics_tests/graphics_tests.pro b/graphics/graphics_tests/graphics_tests.pro index b5afa11d32..08a8bee7ac 100644 --- a/graphics/graphics_tests/graphics_tests.pro +++ b/graphics/graphics_tests/graphics_tests.pro @@ -14,7 +14,7 @@ win32 { LIBS *= -lopengl32 -lshell32 win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" +macx-*: LIBS *= "-framework Foundation" SOURCES += \ ../../testing/testingmain.cpp \ diff --git a/gui/gui_tests/gui_tests.pro b/gui/gui_tests/gui_tests.pro index e18b91e1dd..87609ad867 100644 --- a/gui/gui_tests/gui_tests.pro +++ b/gui/gui_tests/gui_tests.pro @@ -15,7 +15,7 @@ win32* { win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" "-framework IOKit" +macx-*: LIBS *= "-framework Foundation" "-framework IOKit" SOURCES += \ ../../testing/testingmain.cpp \ diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro index ba6ba89981..7b2a80ff8b 100644 --- a/indexer/indexer_tests/indexer_tests.pro +++ b/indexer/indexer_tests/indexer_tests.pro @@ -13,7 +13,7 @@ win32 { LIBS *= -lShell32 win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" +macx-*: LIBS *= "-framework Foundation" HEADERS += \ test_polylines.hpp \ diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro index cb0d08fc00..aee7d87b3b 100644 --- a/map/benchmark_tool/benchmark_tool.pro +++ b/map/benchmark_tool/benchmark_tool.pro @@ -18,7 +18,7 @@ win32 { LIBS *= -lShell32 win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" +macx-*: LIBS *= "-framework Foundation" SOURCES += \ features_loading.cpp \ diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro index 40781b9909..f171c26518 100644 --- a/map/map_tests/map_tests.pro +++ b/map/map_tests/map_tests.pro @@ -17,7 +17,7 @@ win32* { LIBS *= -lShell32 -lOpengl32 win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" "-framework IOKit" +macx-*: LIBS *= "-framework Foundation" "-framework IOKit" SOURCES += \ ../../testing/testingmain.cpp \ diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro index 5b4beb6c16..0b91010f1b 100644 --- a/map/mwm_tests/mwm_tests.pro +++ b/map/mwm_tests/mwm_tests.pro @@ -17,7 +17,7 @@ win32* { LIBS *= -lShell32 -lOpengl32 win32-g++: LIBS *= -lpthread } -macx*: LIBS *= "-framework Foundation" "-framework IOKit" +macx-*: LIBS *= "-framework Foundation" "-framework IOKit" SOURCES += \ ../../testing/testingmain.cpp \ diff --git a/platform/platform.pro b/platform/platform.pro index 13e048c10f..6d0ff10747 100644 --- a/platform/platform.pro +++ b/platform/platform.pro @@ -19,7 +19,7 @@ INCLUDEPATH += $$ROOT_DIR/3party/jansson/src location_service.cpp HEADERS += wifi_info.hpp \ location_service.hpp - !macx* { + !macx-* { QT *= network SOURCES += http_thread_qt.cpp HEADERS += http_thread_qt.hpp @@ -28,7 +28,7 @@ INCLUDEPATH += $$ROOT_DIR/3party/jansson/src win32* { SOURCES += platform_win.cpp \ wifi_info_windows.cpp - } else:macx* { + } else:macx-* { OBJECTIVE_SOURCES += platform_mac.mm \ apple_video_timer.mm \ apple_location_service.mm @@ -43,7 +43,7 @@ INCLUDEPATH += $$ROOT_DIR/3party/jansson/src pthread_video_timer.cpp } -macx*|iphone* { +macx-*|iphone* { HEADERS += http_thread_apple.h OBJECTIVE_SOURCES += http_thread_apple.mm } diff --git a/platform/platform_tests/platform_tests.pro b/platform/platform_tests/platform_tests.pro index a03677437e..8a9169bdfe 100644 --- a/platform/platform_tests/platform_tests.pro +++ b/platform/platform_tests/platform_tests.pro @@ -18,7 +18,7 @@ win32* { LIBS *= -lShell32 win32-g++: LIBS *= -lpthread } -macx* { +macx-* { QT *= widgets # needed for QApplication with event loop, to test async events (downloader, etc.) LIBS *= "-framework Foundation" "-framework IOKit" "-framework QuartzCore" } diff --git a/qt/qt.pro b/qt/qt.pro index fa99961ef9..aa9cd02f8b 100644 --- a/qt/qt.pro +++ b/qt/qt.pro @@ -70,7 +70,7 @@ linux* { INSTALLS += target desktop pixmaps icon128 OTHER_RES CLASSIFICATOR_RES MDPI_SKIN_RES XHDPI_SKIN_RES FONT_RES MWM_RES } -macx* { +macx-* { LIBS *= "-framework CoreLocation" "-framework Foundation" "-framework CoreWLAN" \ "-framework QuartzCore" "-framework IOKit" diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro index d736c98edf..7cbd9b2d9a 100644 --- a/storage/storage_tests/storage_tests.pro +++ b/storage/storage_tests/storage_tests.pro @@ -12,7 +12,7 @@ include($$ROOT_DIR/common.pri) win32*: LIBS *= -lshell32 win32-g++: LIBS *= -lpthread -macx*: LIBS *= "-framework Foundation" "-framework IOKit" +macx-*: LIBS *= "-framework Foundation" "-framework IOKit" QT *= core diff --git a/tools/autobuild/build.sh b/tools/autobuild/build.sh index 56ea2006e9..acb16a7a43 100644 --- a/tools/autobuild/build.sh +++ b/tools/autobuild/build.sh @@ -36,7 +36,7 @@ BuildQt() { mkdir -p "$SHADOW_DIR" cd "$SHADOW_DIR" - "$QMAKE" -r "$QMAKE_PARAMS" -spec "$MKSPEC" "$LOCAL_DIRNAME/../../omim.pro" + "$QMAKE" CONFIG-=sdk -r "$QMAKE_PARAMS" -spec "$MKSPEC" "$LOCAL_DIRNAME/../../omim.pro" # make clean > /dev/null || true make -j $(GetCPUCores) ) diff --git a/tools/mkspecs/iphonesimulator-clang/qmake.conf b/tools/mkspecs/iphonesimulator-clang/qmake.conf index d4b24466e9..1a4ba89cce 100644 --- a/tools/mkspecs/iphonesimulator-clang/qmake.conf +++ b/tools/mkspecs/iphonesimulator-clang/qmake.conf @@ -60,7 +60,7 @@ QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300 QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks -QMAKE_CFLAGS += -pipe +QMAKE_CFLAGS += -pipe -arch i386 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w diff --git a/tools/mkspecs/iphonesimulator-llvm/qmake.conf b/tools/mkspecs/iphonesimulator-llvm/qmake.conf index 84b8c5135a..9d3c723f77 100644 --- a/tools/mkspecs/iphonesimulator-llvm/qmake.conf +++ b/tools/mkspecs/iphonesimulator-llvm/qmake.conf @@ -60,7 +60,7 @@ QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=40300 QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -fmessage-length=0 -fpascal-strings -fasm-blocks -QMAKE_CFLAGS += -pipe +QMAKE_CFLAGS += -pipe -arch i386 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w