diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-20 15:25:34 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-27 13:07:16 +0100 |
| commit | c3278e33534fe937fe367dfbf648282ceba68c7f (patch) | |
| tree | 31b266cd37ee052adabc5ee9343636974c912168 /mkspecs/features/mac | |
| parent | 67f925701b490e3e9cdbb0dbbfc1a14d1b409bd3 (diff) | |
iOS: Replace device and simulator makespecs with single makespec
And use configure's -sdk argument to choose between the iphoneos and the
iphonesimulator SDK. xcodebuild -showsdks can be used to list the
available SDKs. Passing an SDK without a version postfix implies
the latest version of the SDK.
Change-Id: I881df754d522fc91aaa16ba3e39cf0c37a21a1f1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'mkspecs/features/mac')
| -rw-r--r-- | mkspecs/features/mac/sdk.prf | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 4c3e2d2b5a..57dcf7f5eb 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -36,7 +36,15 @@ } !equals(MAKEFILE_GENERATOR, XCODE) { - version_min_flag = -m$${QMAKE_MAC_PLATFORM_NAME}-version-min=$$QMAKE_MACOSX_DEPLOYMENT_TARGET + # FIXME: Get the version_min_flag out of the platform's 'Native Build System.xcspec' + version_identifier = $$replace(QMAKE_MAC_PLATFORM_NAME, iphonesimulator, ios-simulator) + + ios:!host_build: \ + deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET + else: \ + deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET + + version_min_flag = -m$${version_identifier}-version-min=$$deployment_target QMAKE_CFLAGS += $$version_min_flag QMAKE_CXXFLAGS += $$version_min_flag QMAKE_OBJECTIVE_CFLAGS += $$version_min_flag |