Another build fix after r188239.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Aug 2015 06:40:56 +0000 (06:40 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Aug 2015 06:40:56 +0000 (06:40 +0000)
* TestWebKitAPI/PlatformWin.cmake:
Link with more libraries.
* WinLauncher/CMakeLists.txt:
/NODEFAULTLIB:MSVCRT is not just needed for AppleWin.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/TestWebKitAPI/PlatformWin.cmake
Tools/WinLauncher/CMakeLists.txt

index 47d6a2f..3319f76 100644 (file)
@@ -1,3 +1,12 @@
+2015-08-10  Alex Christensen  <achristensen@webkit.org>
+
+        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  <rniwa@webkit.org>
 
         Build fix after r188237.
index 392c3ed..6d3d9b4 100644 (file)
@@ -27,7 +27,12 @@ set(test_webcore_LIBRARIES
 if (${WTF_PLATFORM_WIN_CAIRO})
     list(APPEND test_webcore_LIBRARIES
         cairo
-        curl
+        libANGLE
+        libeay32
+        mfuuid
+        ssleay32
+        strmiids
+        vcruntime
     )
 else ()
     list(APPEND test_webcore_LIBRARIES
index 43d9ba7..30eea8e 100644 (file)
@@ -40,12 +40,12 @@ if (WTF_PLATFORM_WIN_CAIRO)
         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})