Title: [218258] trunk/Source/WebKit
- Revision
- 218258
- Author
- [email protected]
- Date
- 2017-06-14 09:01:56 -0700 (Wed, 14 Jun 2017)
Log Message
[Win64] Fails to build Asm.lib (PaintHooks.asm) since Bug 173132
https://bugs.webkit.org/show_bug.cgi?id=173308
Patch by Fujii Hironori <[email protected]> on 2017-06-14
Reviewed by Alex Christensen.
Use the same method to process asm file as well as JSC does (Bug 170833).
* PlatformWin.cmake: Use add_custom_command to assemble PaintHooks.asm.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (218257 => 218258)
--- trunk/Source/WebKit/ChangeLog 2017-06-14 15:40:51 UTC (rev 218257)
+++ trunk/Source/WebKit/ChangeLog 2017-06-14 16:01:56 UTC (rev 218258)
@@ -1,3 +1,14 @@
+2017-06-14 Fujii Hironori <[email protected]>
+
+ [Win64] Fails to build Asm.lib (PaintHooks.asm) since Bug 173132
+ https://bugs.webkit.org/show_bug.cgi?id=173308
+
+ Reviewed by Alex Christensen.
+
+ Use the same method to process asm file as well as JSC does (Bug 170833).
+
+ * PlatformWin.cmake: Use add_custom_command to assemble PaintHooks.asm.
+
2017-06-09 Per Arne Vollan <[email protected]>
[Win64] Build error when compiling PaintHooks.asm.
Modified: trunk/Source/WebKit/PlatformWin.cmake (218257 => 218258)
--- trunk/Source/WebKit/PlatformWin.cmake 2017-06-14 15:40:51 UTC (rev 218257)
+++ trunk/Source/WebKit/PlatformWin.cmake 2017-06-14 16:01:56 UTC (rev 218258)
@@ -254,13 +254,25 @@
)
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
- enable_language(ASM_MASM)
- add_library(Asm STATIC
- "win/plugins/PaintHooks.asm"
- )
- list(APPEND WebKit_LIBRARIES
- PRIVATE Asm
- )
+ if (MSVC)
+ set(MASM_EXECUTABLE ml64)
+ set(MASM_FLAGS /c /Fo)
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/PaintHooks.obj
+ MAIN_DEPENDENCY win/plugins/PaintHooks.asm
+ COMMAND ${MASM_EXECUTABLE} ${MASM_FLAGS}
+ ${DERIVED_SOURCES_WEBKIT_DIR}/PaintHooks.obj
+ ${CMAKE_CURRENT_SOURCE_DIR}/win/plugins/PaintHooks.asm
+ VERBATIM)
+ list(APPEND WebKit_SOURCES
+ ${DERIVED_SOURCES_WEBKIT_DIR}/PaintHooks.obj
+ )
+ else ()
+ enable_language(ASM_MASM)
+ list(APPEND WebKit_SOURCES
+ win/plugins/PaintHooks.asm
+ )
+ endif ()
endif ()
list(APPEND WebKit_SOURCES ${WebKit_INCLUDES} ${WebKit_SOURCES_Classes} ${WebKit_SOURCES_WebCoreSupport})
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
