Changeset 252086 in webkit
- Timestamp:
- Nov 5, 2019 2:57:46 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r251963 r252086 1 2019-11-05 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 [Win][CMake] Build WebCore as an OBJECT library for WinCairo port 4 https://bugs.webkit.org/show_bug.cgi?id=203663 5 6 Reviewed by Ross Kirsling. 7 8 WebCore is using __declspec(dllexport) to export symbols, but it 9 is built as a static library rather than a DLL. If any symbols in 10 an object file aren't referenced from WebKit.dll, they won't be 11 included in WebKit.dll. 12 13 This issue can be solved either by using OBJECT library for 14 WebCore or using /WHOLEARCHIVE:WebCore.lib for WebKit. 15 16 This change takes OBJECT library approach becuase it doesn't 17 generate unnecessary static libs (WebCore.lib) and it's already 18 used for non-unified source builds for the library size issue (Bug 19 196866 Comment 4). 20 21 However, AppleWin can't use it because the Apple internal builds 22 need to generate the static libs and OBJECT library doesn't work 23 well with makesafeseh.obj. 24 25 * Source/cmake/OptionsWin.cmake: Removed code overriding library types. 26 * Source/cmake/OptionsWinCairo.cmake: Use OBJECT library types for WebCore and WebCoreTestSupport. 27 1 28 2019-11-02 Devin Rousso <drousso@apple.com> 2 29 -
trunk/Source/WebCore/CMakeLists.txt
r251841 r252086 1231 1231 1232 1232 set(WebCoreTestSupport_LIBRARIES 1233 WebCore1234 1233 WebKit::JavaScriptCore 1235 1234 ) 1235 if (NOT WTF_OS_WINDOWS) 1236 list(APPEND WebCoreTestSupport_LIBRARIES WebCore) 1237 endif () 1236 1238 1237 1239 if (ENABLE_LEGACY_ENCRYPTED_MEDIA) -
trunk/Source/WebCore/ChangeLog
r252079 r252086 1 2019-11-05 Fujii Hironori <Hironori.Fujii@sony.com> 2 3 [Win][CMake] Build WebCore as an OBJECT library unless Apple internal builds 4 https://bugs.webkit.org/show_bug.cgi?id=203663 5 6 Reviewed by Ross Kirsling. 7 8 No behavioral changes. 9 10 * CMakeLists.txt: Changed WebCoreTestSupport not to link with 11 WebCore for Windows. Because WebKit.dll exports WebCore symbols, 12 they will be duplicated with WebCore. 13 1 14 2019-11-05 Ryosuke Niwa <rniwa@webkit.org> 2 15 -
trunk/Source/cmake/OptionsWin.cmake
r250597 r252086 162 162 set(WebKitLegacy_LIBRARY_TYPE SHARED) 163 163 164 if (NOT ENABLE_UNIFIED_BUILDS)165 if (WebCore_LIBRARY_TYPE MATCHES STATIC)166 set(WebCore_LIBRARY_TYPE OBJECT)167 endif ()168 if (WebCoreTestSupport_LIBRARY_TYPE MATCHES STATIC)169 set(WebCoreTestSupport_LIBRARY_TYPE OBJECT)170 endif ()171 endif ()172 173 164 # If <winsock2.h> is not included before <windows.h> redefinition errors occur 174 165 # unless _WINSOCKAPI_ is defined before <windows.h> is included -
trunk/Source/cmake/OptionsWinCairo.cmake
r249944 r252086 65 65 set(WTF_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/WTF/Scripts) 66 66 set(JavaScriptCore_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Scripts) 67 68 # Override library types 69 set(WebCore_LIBRARY_TYPE OBJECT) 70 set(WebCoreTestSupport_LIBRARY_TYPE OBJECT)
Note: See TracChangeset
for help on using the changeset viewer.