pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] Compilation for iOS with QT5 toolchain.

Browse source
This commit is contained in:
vng 2013-07-07 01:28:59 +03:00 • committed by Alex Zolotarev
parent 4d9fb7de86
commit c9c9f2ec5c
16 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.pri
View file

@ -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

2
generator/generator_tests/generator_tests.pro
View file

@ -14,7 +14,7 @@ win32 {
LIBS *= -lShell32
win32-g++: LIBS *= -lpthread
}
macx*: LIBS *= "-framework Foundation"
macx-*: LIBS *= "-framework Foundation"
HEADERS += \

2
generator/generator_tool/generator_tool.pro
View file

@ -16,7 +16,7 @@ TEMPLATE = app
QT *= core
win32: LIBS *= -lShell32
macx*: LIBS *= "-framework Foundation"
macx-*: LIBS *= "-framework Foundation"
SOURCES += \
generator_tool.cpp \

2
graphics/graphics_tests/graphics_tests.pro
View file

@ -14,7 +14,7 @@ win32 {
LIBS *= -lopengl32 -lshell32
win32-g++: LIBS *= -lpthread
}
macx*: LIBS *= "-framework Foundation"
macx-*: LIBS *= "-framework Foundation"
SOURCES += \
../../testing/testingmain.cpp \

2
gui/gui_tests/gui_tests.pro
View file

@ -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 \

2
indexer/indexer_tests/indexer_tests.pro
View file

@ -13,7 +13,7 @@ win32 {
LIBS *= -lShell32
win32-g++: LIBS *= -lpthread
}
macx*: LIBS *= "-framework Foundation"
macx-*: LIBS *= "-framework Foundation"
HEADERS += \
test_polylines.hpp \

2
map/benchmark_tool/benchmark_tool.pro
View file

@ -18,7 +18,7 @@ win32 {
LIBS *= -lShell32
win32-g++: LIBS *= -lpthread
}
macx*: LIBS *= "-framework Foundation"
macx-*: LIBS *= "-framework Foundation"
SOURCES += \
features_loading.cpp \

2
map/map_tests/map_tests.pro
View file

@ -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 \

2
map/mwm_tests/mwm_tests.pro
View file

@ -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 \

6
platform/platform.pro
View file

@ -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
}

2
platform/platform_tests/platform_tests.pro
View file

@ -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"
}

2
qt/qt.pro
View file

@ -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"

2
storage/storage_tests/storage_tests.pro
View file

@ -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

2
tools/autobuild/build.sh
View file

@ -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)
)

2
tools/mkspecs/iphonesimulator-clang/qmake.conf
View file

@ -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

2
tools/mkspecs/iphonesimulator-llvm/qmake.conf
View file

@ -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