From 36d3f24d6aebf9d4f56d42eb7702fc40c7406e29 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Thu, 29 Sep 2016 20:04:19 -0700 Subject: Don't disable CoreText on watchOS Simulator (take 2) Follows up f607233c7ce899c27034eca01c23b0da2895bf93 (which originally introduced this workaround) and 397f345a6a2c69c8f15f5d2f21989c303aca586e (which refactored simulator_and_device not to use exclusive builds). Change-Id: I97f0edefb1bc97167cfa83e4ac0f7581713fb092 Reviewed-by: Oswald Buddenhagen --- src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/3rdparty/harfbuzz-ng') diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro index d135b8a9fd..0f7d7c2bda 100644 --- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro +++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro @@ -160,9 +160,15 @@ contains(SHAPERS, coretext) { # in the watchOS Simulator SDK like they are supposed to be. Work around the problem # by adding the device SDK's headers to the search path as a fallback. # rdar://25314492, rdar://27844864 - watchos:CONFIG(simulator, simulator|device) { - QMAKE_CXXFLAGS += \ - -F$$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks \ - -F$$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks + watchos:simulator { + simulator_system_frameworks = $$xcodeSDKInfo(Path, $${simulator.sdk})/System/Library/Frameworks + device_system_frameworks = $$xcodeSDKInfo(Path, $${device.sdk})/System/Library/Frameworks + for (arch, QMAKE_APPLE_SIMULATOR_ARCHS) { + QMAKE_CXXFLAGS += \ + -Xarch_$${arch} \ + -F$$simulator_system_frameworks \ + -Xarch_$${arch} \ + -F$$device_system_frameworks + } } } -- cgit v1.2.3