iOS: Set ARCHS in Xcode project for both simulator and device SDKs
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:
parent
3567f4c2fc
commit
40e69879a2
@ -61,15 +61,21 @@ macx-xcode {
|
||||
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
|
||||
equals(QT_ARCH, arm): \
|
||||
actual_archs = $$QMAKE_IOS_DEVICE_ARCHS
|
||||
else: \
|
||||
actual_archs = $$QMAKE_IOS_SIMULATOR_ARCHS
|
||||
|
||||
macx-xcode {
|
||||
QMAKE_XCODE_ARCHS = $$actual_archs
|
||||
} else {
|
||||
for(arch, actual_archs): \
|
||||
arch_flags += -arch $$arch
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user