Title: [195732] trunk/Source/WebKit2
- Revision
- 195732
- Author
- [email protected]
- Date
- 2016-01-27 22:45:13 -0800 (Wed, 27 Jan 2016)
Log Message
Fix other builds.
* Configurations/WebKit.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (195731 => 195732)
--- trunk/Source/WebKit2/ChangeLog 2016-01-28 06:23:57 UTC (rev 195731)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-28 06:45:13 UTC (rev 195732)
@@ -1,3 +1,9 @@
+2016-01-27 Dan Bernstein <[email protected]>
+
+ Fix other builds.
+
+ * Configurations/WebKit.xcconfig:
+
2016-01-27 Anders Carlsson <[email protected]>
Fix build.
Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (195731 => 195732)
--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2016-01-28 06:23:57 UTC (rev 195731)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2016-01-28 06:45:13 UTC (rev 195732)
@@ -33,9 +33,11 @@
INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt;
-FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphoneos*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios) -framework IOSurface -framework PassKit;
-FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphonesimulator*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios) -framework PassKit;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt $(FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_$(PLATFORM_NAME));
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphoneos*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios) -framework IOSurface;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphonesimulator*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios);
+FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphoneos = -framework PassKit;
+FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphonesimulator = -framework PassKit;
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
