Title: [261720] branches/safari-610.1.13-branch/Source/WebKitLegacy
- Revision
- 261720
- Author
- alanc...@apple.com
- Date
- 2020-05-14 16:27:58 -0700 (Thu, 14 May 2020)
Log Message
Cherry-pick r261627. rdar://problem/63248356
[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:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261627 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.13-branch/Source/WebKitLegacy/ChangeLog (261719 => 261720)
--- branches/safari-610.1.13-branch/Source/WebKitLegacy/ChangeLog 2020-05-14 23:18:51 UTC (rev 261719)
+++ branches/safari-610.1.13-branch/Source/WebKitLegacy/ChangeLog 2020-05-14 23:27:58 UTC (rev 261720)
@@ -1,3 +1,32 @@
+2020-05-14 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r261627. rdar://problem/63248356
+
+ [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:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261627 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 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: branches/safari-610.1.13-branch/Source/WebKitLegacy/PlatformWin.cmake (261719 => 261720)
--- branches/safari-610.1.13-branch/Source/WebKitLegacy/PlatformWin.cmake 2020-05-14 23:18:51 UTC (rev 261719)
+++ branches/safari-610.1.13-branch/Source/WebKitLegacy/PlatformWin.cmake 2020-05-14 23:27:58 UTC (rev 261720)
@@ -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
