diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-01 13:18:15 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-26 13:19:01 +0100 |
| commit | 6e594a945164d661d0e1336fcdde784ccd41f5b7 (patch) | |
| tree | 66fc54c27d34eccb264c53d061b1711d9291f9ba /mkspecs/unsupported | |
| parent | d8986893003b2080d2b3383ee283f1b8ee13d645 (diff) | |
iOS: Move device/simulator conditionals out of common mkspecs
Instead we deal with any differenced by setting variables in the top
level makespecs, that are used by the common makespec configs.
Change-Id: Iae1fb5fef8c95778511ed400008731989b446f3c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'mkspecs/unsupported')
| -rw-r--r-- | mkspecs/unsupported/macx-iosdevice-clang/qmake.conf | 28 | ||||
| -rw-r--r-- | mkspecs/unsupported/macx-iossimulator-clang/qmake.conf | 20 |
2 files changed, 26 insertions, 22 deletions
diff --git a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf index b04d6070ae..330dcf6c3c 100644 --- a/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf +++ b/mkspecs/unsupported/macx-iosdevice-clang/qmake.conf @@ -1,10 +1,13 @@ # # qmake configuration for ios-device-clang # -# Depends on: -# -# QMAKE_IOS_XCODE_VERSION - set in mkspecs/common/ios/versions.conf -# + +QMAKE_IOS_DEVICE_TYPE = iPhoneOS + +# Samsung S5PC100, Apple A4, A5, A5X +QMAKE_IOS_TARGET_ARCH = armv7 + +# FIXME: Add armv7s (A6) support when we need it include(../../common/mac.conf) include(../../common/gcc-base-ios.conf) @@ -15,19 +18,4 @@ include(../../common/ios/clang.conf) include(../../common/ios/qmake.conf) include(../../common/ios/arch.conf) -# Version check -lessThan(QMAKE_IOS_XCODE_VERSION, "4.3"): error("This mkspec requires Xcode 4.3 or later") - -# iOS build tools -QMAKE_CC = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -QMAKE_CXX = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -QMAKE_FIX_RPATH = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/install_name_tool -id -QMAKE_AR = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq -QMAKE_RANLIB = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s -QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX - -# Check that compiler is valid -!exists($$QMAKE_CXX): error("The version of Xcode installed on this system does not include the clang compiler") - -load(qt_config)
\ No newline at end of file +load(qt_config) diff --git a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf index 11301cb72f..bf334b9960 100644 --- a/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf +++ b/mkspecs/unsupported/macx-iossimulator-clang/qmake.conf @@ -2,5 +2,21 @@ # qmake configuration for ios-simulator-clang # -# All differences between device and simulator are handled in iOS include files -include(../macx-iosdevice-clang/qmake.conf) +QMAKE_IOS_DEVICE_TYPE = iPhoneSimulator + +# Simulator is i386 only +QMAKE_IOS_TARGET_ARCH = i386 + +QMAKE_IOS_CFLAGS += -fexceptions -fasm-blocks +QMAKE_IOS_OBJ_CFLAGS += -fobjc-abi-version=2 -fobjc-legacy-dispatch + +include(../../common/mac.conf) +include(../../common/gcc-base-ios.conf) +include(../../common/clang.conf) +include(../../common/ios.conf) +include(../../common/ios/versions.conf) +include(../../common/ios/clang.conf) +include(../../common/ios/qmake.conf) +include(../../common/ios/arch.conf) + +load(qt_config) |