Title: [195490] tags/Safari-602.1.17.0.1/Source/_javascript_Core
- Revision
- 195490
- Author
- [email protected]
- Date
- 2016-01-22 15:37:23 -0800 (Fri, 22 Jan 2016)
Log Message
Merged r195464. rdar://problem/24296328
Modified Paths
Diff
Modified: tags/Safari-602.1.17.0.1/Source/_javascript_Core/ChangeLog (195489 => 195490)
--- tags/Safari-602.1.17.0.1/Source/_javascript_Core/ChangeLog 2016-01-22 23:36:21 UTC (rev 195489)
+++ tags/Safari-602.1.17.0.1/Source/_javascript_Core/ChangeLog 2016-01-22 23:37:23 UTC (rev 195490)
@@ -1,3 +1,19 @@
+2016-01-22 Babak Shafiei <[email protected]>
+
+ Merge r195464.
+
+ 2016-01-22 Alex Christensen <[email protected]>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=153364
+ <rdar://problem/24296328>
+
+ Reviewed by Brent Fulgham.
+
+ * PlatformWin.cmake:
+ The internal build does not build _javascript_Core with WTF, so it does not automatically link to winmm.lib
+ like it does when everything is built together.
+
2016-01-20 Babak Shafiei <[email protected]>
Roll out r195178.
Modified: tags/Safari-602.1.17.0.1/Source/_javascript_Core/PlatformWin.cmake (195489 => 195490)
--- tags/Safari-602.1.17.0.1/Source/_javascript_Core/PlatformWin.cmake 2016-01-22 23:36:21 UTC (rev 195489)
+++ tags/Safari-602.1.17.0.1/Source/_javascript_Core/PlatformWin.cmake 2016-01-22 23:37:23 UTC (rev 195490)
@@ -15,6 +15,7 @@
list(APPEND _javascript_Core_LIBRARIES
CoreFoundation${DEBUG_SUFFIX}
${ICU_LIBRARIES}
+ winmm
)
endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
