AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: Set ARCHS in Xcode project for both simulator and device SDKs

Browse Source 
Removes the need to pass ARCHS to xcodebuild for simulator builds.

Change-Id: If15e9d387c416c5c9f83c50f5903ae0cd517ff34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Tor Arne Vestbø 2013-10-25 14:42:48 +02:00 committed by The Qt Project
parent 3567f4c2fc
commit 40e69879a2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkspecs/macx-ios-clang/features/default_post.prf
View File

@ -61,15 +61,21 @@ macx-xcode {
QMAKE_MAC_XCODE_SETTINGS += ios_device_family QMAKE_MAC_XCODE_SETTINGS += ios_device_family
} }
macx-xcode {
arch_iphoneos.name = "ARCHS[sdk=iphoneos*]"
arch_iphoneos.value = $$QMAKE_IOS_DEVICE_ARCHS
arch_iphonesimulator.name = "ARCHS[sdk=iphonesimulator*]"
arch_iphonesimulator.value = $$QMAKE_IOS_SIMULATOR_ARCHS
QMAKE_MAC_XCODE_SETTINGS += arch_iphoneos arch_iphonesimulator
unset(QMAKE_XCODE_ARCHS)
} else {
# Be more specific about which architecture we're targeting # Be more specific about which architecture we're targeting
equals(QT_ARCH, arm): \ equals(QT_ARCH, arm): \
actual_archs = $$QMAKE_IOS_DEVICE_ARCHS actual_archs = $$QMAKE_IOS_DEVICE_ARCHS
else: \ else: \
actual_archs = $$QMAKE_IOS_SIMULATOR_ARCHS actual_archs = $$QMAKE_IOS_SIMULATOR_ARCHS
macx-xcode {
QMAKE_XCODE_ARCHS = $$actual_archs
} else {
for(arch, actual_archs): \ for(arch, actual_archs): \
arch_flags += -arch $$arch arch_flags += -arch $$arch