aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan <sentrycraft123@gmail.com>2024-06-14 10:40:05 +0200
committerGitHub <noreply@github.com>2024-06-14 10:40:05 +0200
commita06319c974342c41294fef601a8a873a3e488bfc (patch)
tree2707102215ba7ed4a6dcf9b77a91b1d497bc3bdb
parent220b7a1bf7915a336b9c2a08806e60c1c32bde8e (diff)
downloadNorthstarLauncher-a06319c974342c41294fef601a8a873a3e488bfc.tar.gz
NorthstarLauncher-a06319c974342c41294fef601a8a873a3e488bfc.zip
Use old Mutex constructor to deal with redist incompatibility (#704)v1.24.6-rc2v1.24.6
See GitHub PR for detailed explanation
-rw-r--r--CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab461ae2..23a8b7f5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,8 @@ set(CMAKE_CXX_STANDARD 20)
set(CMAKE_C_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_VS_PLATFORM_TOOLSET v143)
+# Deal with MSVC incompatiblity
+add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
# This determines the real binary root directory
set(NS_BINARY_DIR ${CMAKE_BINARY_DIR}/game)