Title: [196504] tags/Safari-602.1.18.9/Source/WebKit
- Revision
- 196504
- Author
- [email protected]
- Date
- 2016-02-12 13:54:53 -0800 (Fri, 12 Feb 2016)
Log Message
Merged r196502. rdar://problem/24635219
Modified Paths
Diff
Modified: tags/Safari-602.1.18.9/Source/WebKit/ChangeLog (196503 => 196504)
--- tags/Safari-602.1.18.9/Source/WebKit/ChangeLog 2016-02-12 21:52:17 UTC (rev 196503)
+++ tags/Safari-602.1.18.9/Source/WebKit/ChangeLog 2016-02-12 21:54:53 UTC (rev 196504)
@@ -1,5 +1,17 @@
2016-02-12 Babak Shafiei <[email protected]>
+ Merge r196502.
+
+ 2016-02-12 Alex Christensen <[email protected]>
+
+ Fix internal Windows WebKit debug build.
+ rdar://problem/24635219
+
+ * PlatformWin.cmake:
+ We were making WebKit.dll instead of WebKit_debug.dll.
+
+2016-02-12 Babak Shafiei <[email protected]>
+
Merge r196462.
2016-02-11 Alex Christensen <[email protected]>
Modified: tags/Safari-602.1.18.9/Source/WebKit/PlatformWin.cmake (196503 => 196504)
--- tags/Safari-602.1.18.9/Source/WebKit/PlatformWin.cmake 2016-02-12 21:52:17 UTC (rev 196503)
+++ tags/Safari-602.1.18.9/Source/WebKit/PlatformWin.cmake 2016-02-12 21:54:53 UTC (rev 196504)
@@ -471,3 +471,7 @@
set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")
file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul")
add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)
+
+set(WebKit_OUTPUT_NAME
+ WebKit${DEBUG_SUFFIX}
+)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
