diff options
Diffstat (limited to 'Source/cmake/OptionsWindows.cmake')
| -rw-r--r-- | Source/cmake/OptionsWindows.cmake | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/Source/cmake/OptionsWindows.cmake b/Source/cmake/OptionsWindows.cmake index 6234b0dd3..f31a28c26 100644 --- a/Source/cmake/OptionsWindows.cmake +++ b/Source/cmake/OptionsWindows.cmake @@ -1,22 +1,17 @@ -ADD_DEFINITIONS(-DWTF_PLATFORM_WIN=1) -SET(WTF_PLATFORM_WIN 1) +add_definitions(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE) -ADD_DEFINITIONS(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE) +include_directories(${JAVASCRIPTCORE_DIR}/os-win32) -INCLUDE_DIRECTORIES(${JAVASCRIPTCORE_DIR}/os-win32) - -IF (MSVC) - ADD_DEFINITIONS(/WX +if (MSVC) + add_definitions(/WX /wd4018 /wd4065 /wd4068 /wd4099 /wd4100 /wd4127 /wd4138 /wd4180 /wd4189 /wd4201 /wd4244 /wd4251 /wd4275 /wd4288 /wd4291 /wd4305 /wd4344 /wd4355 /wd4389 /wd4396 /wd4503 /wd4505 /wd4510 /wd4512 /wd4610 /wd4706 /wd4800 /wd4951 /wd4952 /wd4996) - STRING(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions - STRING(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI - - IF (NOT MSVC_VERSION LESS 1500) - SET(CMAKE_C_FLAGS "/MP ${CMAKE_C_FLAGS}") - SET(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}") - ENDIF () -ENDIF () + string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions + string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI -STRING(REPLACE "/ENTRY:mainACRTStartup" "/ENTRY:WinMainCRTStartup" CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS}) + if (NOT MSVC_VERSION LESS 1500) + set(CMAKE_C_FLAGS "/MP ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS}") + endif () +endif () |