Changeset 194434 in webkit
- Timestamp:
- Dec 28, 2015 9:15:56 PM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r194433 r194434 3731 3731 if (MSVC) 3732 3732 ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES) 3733 if (CMAKE_SIZEOF_VOID_P EQUAL 4)3734 list(APPEND WebCore_SOURCES platform/win/makesafeseh.asm)3735 set_source_files_properties(platform/win/makesafeseh.asm PROPERTIES COMPILE_FLAGS "/safeseh")3736 endif ()3737 3733 endif () 3738 3734 -
trunk/Source/WebCore/ChangeLog
r194433 r194434 1 2015-12-28 Alex Christensen <achristensen@webkit.org> 2 3 Fix Windows build, ostensibly after r194424. 4 5 * CMakeLists.txt: 6 * PlatformWin.cmake: 7 ml.exe was given too many unneeded parameters (/Idir1 /Idir2 etc.), and it was failing sometimes with long directories. 8 Instead of compiling makesafeseh.asm as a normal source file, we now put only the parameters that are needed to assemble 9 the object file, then link with the object file. 10 1 11 2015-12-28 Brady Eidson <beidson@apple.com> 2 12 -
trunk/Source/WebCore/PlatformWin.cmake
r192339 r194434 41 41 ) 42 42 43 enable_language(ASM_MASM)44 43 list(APPEND WebCore_SOURCES 45 44 accessibility/win/AXObjectCacheWin.cpp … … 247 246 ) 248 247 248 if (CMAKE_SIZEOF_VOID_P EQUAL 4) 249 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj) 250 add_custom_command( 251 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj 252 DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm 253 COMMAND ml /safeseh /c /Fo ${DERIVED_SOURCES_WEBCORE_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm 254 VERBATIM) 255 endif () 256 249 257 if (${WTF_PLATFORM_WIN_CAIRO}) 250 258 include(PlatformWinCairo.cmake)
Note: See TracChangeset
for help on using the changeset viewer.