summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-02-11 15:09:39 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-02-11 15:09:39 +0100
commitef39c8f33e8374d5ef7dddff52a0d752b7181ed4 (patch)
tree8d93e608d84a3a88be9af7cf0a719e580c077752
parent59643d744989fac781ba096d433b3059c27d3f53 (diff)
cmake: try switching to -MD now
-rw-r--r--cmake/msvc.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index 0469617d..71a96540 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -146,16 +146,16 @@ elseif(opentrack-64bit)
set(opentrack-simd "AVX")
endif()
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>Dll")
add_link_options(-cgthreads:1)
set(_CFLAGS "-diagnostics:caret -Zc:inline -Zc:preprocessor -wd4117 -Zi -Zf -Zo -bigobj -cgthreads1 -vd0 -permissive-")
-if(NOT opentrack-no-static-crt)
- set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded" CACHE INTERNAL "" FORCE)
-else()
- set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" CACHE INTERNAL "" FORCE)
-endif()
+#if(NOT opentrack-no-static-crt)
+# set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded" CACHE INTERNAL "" FORCE)
+#else()
+# set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" CACHE INTERNAL "" FORCE)
+#endif()
set(_CXXFLAGS "${_CFLAGS} -Zc:throwingNew -Zc:lambda")
set(_CFLAGS_RELEASE "-O2 -Oit -Oy- -Ob3 -fp:fast -GS- -GF -GL -Gw -Gy")
if(NOT opentrack-simd STREQUAL "")