Title: [205347] trunk/Source/WebCore
- Revision
- 205347
- Author
- [email protected]
- Date
- 2016-09-02 10:28:00 -0700 (Fri, 02 Sep 2016)
Log Message
Weak link the GameController.framework on macOS.
Reviewed by Tim Horton.
* Configurations/WebCore.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (205346 => 205347)
--- trunk/Source/WebCore/ChangeLog 2016-09-02 16:26:40 UTC (rev 205346)
+++ trunk/Source/WebCore/ChangeLog 2016-09-02 17:28:00 UTC (rev 205347)
@@ -1,3 +1,11 @@
+2016-09-02 Brady Eidson <[email protected]>
+
+ Weak link the GameController.framework on macOS.
+
+ Reviewed by Tim Horton.
+
+ * Configurations/WebCore.xcconfig:
+
2016-09-02 Commit Queue <[email protected]>
Unreviewed, rolling out r205344.
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (205346 => 205347)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-02 16:26:40 UTC (rev 205346)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-02 17:28:00 UTC (rev 205347)
@@ -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