Title: [261627] trunk/Source/WebKitLegacy
- Revision
- 261627
- Author
- pvol...@apple.com
- Date
- 2020-05-13 11:10:59 -0700 (Wed, 13 May 2020)
Log Message
[Win] Fix AppleWin link error
https://bugs.webkit.org/show_bug.cgi?id=211843
Reviewed by Brent Fulgham.
Make sure uuid.lib comes after WebKitGUID.lib in the list of libraries to link with. Also, add a linker flag
to allow multiple definitions of the same symbol when linking WebKit.dll.
* PlatformWin.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/ChangeLog (261626 => 261627)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-05-13 18:02:09 UTC (rev 261626)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-05-13 18:10:59 UTC (rev 261627)
@@ -1,3 +1,15 @@
+2020-05-13 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin link error
+ https://bugs.webkit.org/show_bug.cgi?id=211843
+
+ Reviewed by Brent Fulgham.
+
+ Make sure uuid.lib comes after WebKitGUID.lib in the list of libraries to link with. Also, add a linker flag
+ to allow multiple definitions of the same symbol when linking WebKit.dll.
+
+ * PlatformWin.cmake:
+
2020-05-01 Per Arne Vollan <pvol...@apple.com>
[Win] Fix AppleWin build
Modified: trunk/Source/WebKitLegacy/PlatformWin.cmake (261626 => 261627)
--- trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-05-13 18:02:09 UTC (rev 261626)
+++ trunk/Source/WebKitLegacy/PlatformWin.cmake 2020-05-13 18:10:59 UTC (rev 261627)
@@ -445,13 +445,13 @@
dxguid
)
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /FORCE:MULTIPLE")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
# We need the webkit libraries to come before the system default libraries to prevent symbol conflicts with uuid.lib.
# To do this we add system default libs as webkit libs and zero out system default libs.
string(REPLACE " " "\;" CXX_LIBS ${CMAKE_CXX_STANDARD_LIBRARIES})
-list(APPEND WebKitLegacy_LIBRARIES ${CXX_LIBS})
+list(APPEND WebKitLegacy_PRIVATE_LIBRARIES ${CXX_LIBS})
set(CMAKE_CXX_STANDARD_LIBRARIES "")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
