Merge remote-tracking branch 'origin/master'

This commit is contained in:
WolverinDEV 2019-10-20 12:09:34 +02:00
commit f403790cf6

View File

@ -67,7 +67,7 @@ if (MSVC)
foreach(CompilerFlag ${CompilerFlags}) foreach(CompilerFlag ${CompilerFlags})
string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
endforeach() endforeach()
add_compile_options("/EHa") #We require exception handling add_compile_options("/EHsc") #We require exception handling
else() else()
set(CMAKE_CXX_FLAGS_RELEASE "-O3") #-DNDEBUG We want assert! set(CMAKE_CXX_FLAGS_RELEASE "-O3") #-DNDEBUG We want assert!
endif() endif()