Title: [162658] trunk/Source/WebKit2
- Revision
- 162658
- Author
- ander...@apple.com
- Date
- 2014-01-23 16:01:39 -0800 (Thu, 23 Jan 2014)
Log Message
Explicitly link XPC services with AppKit
https://bugs.webkit.org/show_bug.cgi?id=127520
<rdar://problem/15759718>
Reviewed by Mark Rowe.
Explicitly link XPC services that use the _NSApplicationMain run loop type with AppKit.
* Configurations/PluginService.32.xcconfig:
* Configurations/PluginService.64.xcconfig:
* Configurations/PluginService.Development.xcconfig:
* Configurations/WebContentService.Development.xcconfig:
* Configurations/WebContentService.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (162657 => 162658)
--- trunk/Source/WebKit2/ChangeLog 2014-01-23 23:50:36 UTC (rev 162657)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-24 00:01:39 UTC (rev 162658)
@@ -1,5 +1,21 @@
2014-01-23 Anders Carlsson <ander...@apple.com>
+ Explicitly link XPC services with AppKit
+ https://bugs.webkit.org/show_bug.cgi?id=127520
+ <rdar://problem/15759718>
+
+ Reviewed by Mark Rowe.
+
+ Explicitly link XPC services that use the _NSApplicationMain run loop type with AppKit.
+
+ * Configurations/PluginService.32.xcconfig:
+ * Configurations/PluginService.64.xcconfig:
+ * Configurations/PluginService.Development.xcconfig:
+ * Configurations/WebContentService.Development.xcconfig:
+ * Configurations/WebContentService.xcconfig:
+
+2014-01-23 Anders Carlsson <ander...@apple.com>
+
Fix build again.
* UIProcess/API/mac/WKView.mm:
Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (162657 => 162658)
--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-01-23 23:50:36 UTC (rev 162657)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-01-24 00:01:39 UTC (rev 162658)
@@ -40,7 +40,8 @@
FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
FRAMEWORK_LDFLAGS_YES = ;
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS_macosx = -framework AppKit;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (162657 => 162658)
--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2014-01-23 23:50:36 UTC (rev 162657)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2014-01-24 00:01:39 UTC (rev 162658)
@@ -40,7 +40,8 @@
FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
FRAMEWORK_LDFLAGS_YES = ;
-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS_macosx = -framework AppKit;
CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
Modified: trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig (162657 => 162658)
--- trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2014-01-23 23:50:36 UTC (rev 162657)
+++ trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2014-01-24 00:01:39 UTC (rev 162658)
@@ -32,3 +32,6 @@
SKIP_INSTALL_macosx = $(inherited);
SKIP_INSTALL_iphoneos = YES;
SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework AppKit;
Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (162657 => 162658)
--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-01-23 23:50:36 UTC (rev 162657)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-01-24 00:01:39 UTC (rev 162658)
@@ -25,3 +25,6 @@
PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
INFOPLIST_FILE = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework AppKit;
Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (162657 => 162658)
--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-01-23 23:50:36 UTC (rev 162657)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-01-24 00:01:39 UTC (rev 162658)
@@ -28,3 +28,6 @@
INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
+OTHER_LDFLAGS_macosx = -framework AppKit;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
