Changeset 264786 in webkit

Timestamp:

Jul 23, 2020 1:27:43 PM (4 years ago)

Author:

Fujii Hironori

Message:

[CMake][Win] Build StructuredExceptionHandlerSuppressor.cpp and makesafeseh.asm only for AppleWin
​https://bugs.webkit.org/show_bug.cgi?id=214671

Reviewed by Per Arne Vollan.

StructuredExceptionHandlerSuppressor is used only by AppleWin port
in platform/graphics/ca/win/LayerChangesFlusher.cpp.
makesafeseh.asm causes a building problem for 32bit WinCairo
because it is using OBJECT library type for WebCore.

• PlatformAppleWin.cmake: Added build rules for them.
• PlatformWin.cmake: Removed build rules for them.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformAppleWin.cmake (modified) (2 diffs)
• PlatformWin.cmake (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-23  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [CMake][Win] Build StructuredExceptionHandlerSuppressor.cpp and makesafeseh.asm only for AppleWin
+        https://bugs.webkit.org/show_bug.cgi?id=214671
+
+        Reviewed by Per Arne Vollan.
+
+        StructuredExceptionHandlerSuppressor is used only by AppleWin port
+        in platform/graphics/ca/win/LayerChangesFlusher.cpp.
+        makesafeseh.asm causes a building problem for 32bit WinCairo
+        because it is using OBJECT library type for WebCore.
+
+        * PlatformAppleWin.cmake: Added build rules for them.
+        * PlatformWin.cmake: Removed build rules for them.
+
 2020-07-23  Andres Gonzalez  <andresg_22@apple.com>
 

trunk/Source/WebCore/PlatformAppleWin.cmake

@@ -54 +54 @@
 
     platform/text/LocaleNone.cpp
+
+    platform/win/StructuredExceptionHandlerSuppressor.cpp
 )
 
@@ -185 +187 @@
     )
 endif ()
+
+if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj)
+    add_custom_command(
+        OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj
+        DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm
+        COMMAND ml /safeseh /c /Fo ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm
+        VERBATIM)
+endif ()

trunk/Source/WebCore/PlatformWin.cmake

@@ -98 +98 @@
     platform/win/SearchPopupMenuWin.cpp
     platform/win/SharedBufferWin.cpp
-    platform/win/StructuredExceptionHandlerSuppressor.cpp
     platform/win/SystemInfo.cpp
     platform/win/UserAgentWin.cpp
@@ -203 +202 @@
 endif ()
 
-if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-    list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj)
-    add_custom_command(
-        OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj
-        DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm
-        COMMAND ml /safeseh /c /Fo ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm
-        VERBATIM)
-endif ()
-
 if (${WTF_PLATFORM_WIN_CAIRO})
     include(PlatformWinCairo.cmake)