From 7d355956836dde845fbd885da7cde680e1a878e6 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Fri, 28 Oct 2022 12:24:50 +0200 Subject: [PATCH] potential fix for #141 --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 776f0be..10f576e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,11 @@ if(APPLE) include_directories(/usr/local/opt/openssl@1.1/include) link_directories(/usr/local/opt/openssl@1.1/lib) endif() +# ------------------------ WINDOWS --------------------------------- +elseif (WIN32) + if (WIN32_STATIC_RUNTIME) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + endif() # ------------------------ UNIX ------------------------------------ elseif (UNIX) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g") @@ -168,13 +173,8 @@ if (UNIX) -Wzero-as-null-pointer-constant ) else() - set(BEAMMP_RT /MDd) - if (WIN32_STATIC_RUNTIME) - set(BEAMMP_RT /MT) - endif() set(BeamMP_CompileOptions - ${BEAMMP_RT} /bigobj ) else()