Title: [188251] trunk/Tools
- Revision
- 188251
- Author
- [email protected]
- Date
- 2015-08-10 23:40:56 -0700 (Mon, 10 Aug 2015)
Log Message
Another build fix after r188239.
* TestWebKitAPI/PlatformWin.cmake:
Link with more libraries.
* WinLauncher/CMakeLists.txt:
/NODEFAULTLIB:MSVCRT is not just needed for AppleWin.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (188250 => 188251)
--- trunk/Tools/ChangeLog 2015-08-11 05:07:07 UTC (rev 188250)
+++ trunk/Tools/ChangeLog 2015-08-11 06:40:56 UTC (rev 188251)
@@ -1,3 +1,12 @@
+2015-08-10 Alex Christensen <[email protected]>
+
+ Another build fix after r188239.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+ Link with more libraries.
+ * WinLauncher/CMakeLists.txt:
+ /NODEFAULTLIB:MSVCRT is not just needed for AppleWin.
+
2015-08-10 Ryosuke Niwa <[email protected]>
Build fix after r188237.
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (188250 => 188251)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-11 05:07:07 UTC (rev 188250)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-08-11 06:40:56 UTC (rev 188251)
@@ -27,7 +27,12 @@
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND test_webcore_LIBRARIES
cairo
- curl
+ libANGLE
+ libeay32
+ mfuuid
+ ssleay32
+ strmiids
+ vcruntime
)
else ()
list(APPEND test_webcore_LIBRARIES
Modified: trunk/Tools/WinLauncher/CMakeLists.txt (188250 => 188251)
--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-11 05:07:07 UTC (rev 188250)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-11 06:40:56 UTC (rev 188251)
@@ -40,12 +40,12 @@
CFLite
)
else ()
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
list(APPEND WinLauncher_LIBRARIES
CoreFoundation
)
endif ()
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
if (${WTF_PLATFORM_WIN_CAIRO})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
