Weak link the GameController.framework on macOS but differently than before.
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Sep 2016 18:14:27 +0000 (18:14 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Sep 2016 18:14:27 +0000 (18:14 +0000)
Reviewed by Dan Bernstein.

* Configurations/WebCore.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@205357 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig

index 2cc2cc8..696ddf9 100644 (file)
@@ -1,3 +1,11 @@
+2016-09-02  Brady Eidson  <beidson@apple.com>
+
+        Weak link the GameController.framework on macOS but differently than before.
+
+        Reviewed by Dan Bernstein.
+        
+        * Configurations/WebCore.xcconfig:
+
 2016-09-02  Chris Dumez  <cdumez@apple.com>
 
         Align proto getter / setter behavior with other browsers
index 35940f0..6bde0fb 100644 (file)
@@ -66,7 +66,7 @@ WK_IOS_BINCOMPAT_LDFLAGS_V9_3 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_0);
 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[sdk=iphone*] = -framework GameController;
+WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD = -framework GameController;
 WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD[sdk=macosx*] = -weak_framework GameController;
 
 OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM) $(WK_GAMECONTROLLER_LDFLAGS);