28f5d79316
There's no reason for this to be separated, regardless of the support status of i386 macOS builds. Additional architectures may appear in the future (and currently there's actually 3 - i386, x86_64, and x86_64h for Haswell CPUs). So this feature could be used to get combined generic x86_64 and Haswell builds. Some system libraries appear to have an x86_64h slice in Sierra. [ChangeLog][Build System] Support for universal binaries on macOS has been re-introduced. Change-Id: I1c89904addf024431fdb3ad03ea8ab85da7240ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
30 lines
1.3 KiB
Plaintext
30 lines
1.3 KiB
Plaintext
|
|
# In case the user sets the SDK manually
|
|
contains(QMAKE_MAC_SDK, ^$${simulator.sdk}.*) {
|
|
!isEmpty(QT_VERSION):qtConfig(simulator_and_device): \
|
|
error("Simulator is handled automatically for simulator_and_device")
|
|
|
|
CONFIG += simulator $${simulator.sdk}
|
|
}
|
|
|
|
build_pass:!simulator_and_device:simulator: \
|
|
QMAKE_MAC_SDK ~= s,^$${device.sdk},$${simulator.sdk},
|
|
|
|
load(sdk)
|
|
|
|
macx-xcode {
|
|
sdk_path_device.name = "QMAKE_MAC_SDK_PATH[sdk=$${device.sdk}*]"
|
|
sdk_path_device.value = $$xcodeSDKInfo(Path, $${device.sdk})
|
|
sdk_path_simulator.name = "QMAKE_MAC_SDK_PATH[sdk=$${simulator.sdk}*]"
|
|
sdk_path_simulator.value = $$xcodeSDKInfo(Path, $${simulator.sdk})
|
|
QMAKE_MAC_XCODE_SETTINGS += sdk_path_device sdk_path_simulator
|
|
QMAKE_MAC_SDK_PATH = "$(QMAKE_MAC_SDK_PATH)"
|
|
|
|
sdk_platform_path_device.name = "QMAKE_MAC_SDK_PLATFORM_PATH[sdk=$${device.sdk}*]"
|
|
sdk_platform_path_device.value = $$xcodeSDKInfo(PlatformPath, $${device.sdk})
|
|
sdk_platform_path_simulator.name = "QMAKE_MAC_SDK_PLATFORM_PATH[sdk=$${simulator.sdk}*]"
|
|
sdk_platform_path_simulator.value = $$xcodeSDKInfo(PlatformPath, $${simulator.sdk})
|
|
QMAKE_MAC_XCODE_SETTINGS += sdk_platform_path_device sdk_platform_path_simulator
|
|
QMAKE_MAC_SDK_PLATFORM_PATH = "$(QMAKE_MAC_SDK_PLATFORM_PATH)"
|
|
}
|