Title: [205356] tags/Safari-603.1.4.1/Source/WebCore
- Revision
- 205356
- Author
- [email protected]
- Date
- 2016-09-02 11:06:41 -0700 (Fri, 02 Sep 2016)
Log Message
Merged r205347. rdar://problem/28127212
Modified Paths
Diff
Modified: tags/Safari-603.1.4.1/Source/WebCore/ChangeLog (205355 => 205356)
--- tags/Safari-603.1.4.1/Source/WebCore/ChangeLog 2016-09-02 18:05:02 UTC (rev 205355)
+++ tags/Safari-603.1.4.1/Source/WebCore/ChangeLog 2016-09-02 18:06:41 UTC (rev 205356)
@@ -1,5 +1,17 @@
2016-09-02 Babak Shafiei <[email protected]>
+ Merge r205347.
+
+ 2016-09-02 Brady Eidson <[email protected]>
+
+ Weak link the GameController.framework on macOS.
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebCore.xcconfig:
+
+2016-09-02 Babak Shafiei <[email protected]>
+
Merge r205333.
2016-09-01 Dan Bernstein <[email protected]>
Modified: tags/Safari-603.1.4.1/Source/WebCore/Configurations/WebCore.xcconfig (205355 => 205356)
--- tags/Safari-603.1.4.1/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-02 18:05:02 UTC (rev 205355)
+++ tags/Safari-603.1.4.1/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-02 18:06:41 UTC (rev 205356)
@@ -66,7 +66,8 @@
WK_IOS_BINCOMPAT_LDFLAGS_V10_0 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_3);
WK_GAMECONTROLLER_LDFLAGS = $(WK_GAMECONTROLLER_LDFLAGS_$(ENABLE_GAMEPAD));
-WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD = -framework GameController;
+WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD[sdk=iphone*] = -framework GameController;
+WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD[sdk=macosx*] = -weak_framework GameController;
OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM) $(WK_GAMECONTROLLER_LDFLAGS);
OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
