diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/msvc.cmake | 5 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index a4a1f5c6..0aad2ac8 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -51,7 +51,6 @@ if(CMAKE_PROJECT_NAME STREQUAL "opentrack") endforeach() set(cc "${cc} -GR-") - set(cc "${cc} -EHs-c-") set(CMAKE_RC_FLAGS "/nologo /DWIN32") endif() @@ -66,7 +65,7 @@ set(_CFLAGS_DEBUG "-GS -sdl -Gs -guard:cf") set(_CXXFLAGS_RELEASE "${cc}") set(_CXXFLAGS_DEBUG "${_CFLAGS_DEBUG}") -set(_LDFLAGS "-cgthreads:1 -DEBUG") +set(_LDFLAGS "-cgthreads:1 -DEBUG -machine:x86 -WX") #set(_ltcg "-LTCG") set(_ltcg "-LTCG:INCREMENTAL") @@ -74,7 +73,7 @@ set(_ltcg "-LTCG:INCREMENTAL") set(_LDFLAGS_RELEASE "-OPT:REF,ICF=4 ${_ltcg}") set(_LDFLAGS_DEBUG "") -set(_LDFLAGS_STATIC "-WX") +set(_LDFLAGS_STATIC "-machine:x86 -WX") set(_LDFLAGS_STATIC_RELEASE "${_ltcg}") set(_LDFLAGS_STATIC_DEBUG "") diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 5ad2709c..630da3bd 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -60,6 +60,7 @@ if(MSVC) add_definitions(-D_ITERATOR_DEBUG_LEVEL=0) add_definitions(-D_HAS_EXCEPTIONS=0) add_definitions(-D_USE_MATH_DEFINES=1) + add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE) add_definitions(-D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING) add_definitions(-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING) |