Disable CONSTEXPR_MUTEX_CONSTRUCTOR everywhere

This is a workaround for the f*cked up Windows runner image that broke STL
ori-community · Jun 9, 2024 · 1373fb3 · 1373fb3
1 parent 93ccb57
commit 1373fb3
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,8 +19,6 @@ jobs:
     steps:
       - name: Enable Git support for long file paths
         run: git config --system core.longpaths true
-      - name: Install VS2022 BuildTools 17.9.7
-        run: choco install -y visualstudio2022buildtools --version=117.9.7.0 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/180911598_-255012421/channel"
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.4
       - run: choco upgrade llvm  # Workaround for https://github.com/actions/runner-images/issues/10001

diff --git a/projects/Common/CMakeLists.txt b/projects/Common/CMakeLists.txt
@@ -63,6 +63,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES};")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 install(
         TARGETS ${PROJECT_NAME}
         RUNTIME DESTINATION "${WOTWR_INSTALL_DIR}"

diff --git a/projects/Core/CMakeLists.txt b/projects/Core/CMakeLists.txt
@@ -224,6 +224,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES}")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 message(STATUS "TESTING ${PROJECT_BINARY_DIR}")
 
 install(

diff --git a/projects/InjectLoader/CMakeLists.txt b/projects/InjectLoader/CMakeLists.txt
@@ -54,6 +54,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES};")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 target_link_libraries(
         ${PROJECT_NAME}
 )

diff --git a/projects/InjectProxy/CMakeLists.txt b/projects/InjectProxy/CMakeLists.txt
@@ -59,6 +59,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES};")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 install(
         TARGETS ${PROJECT_NAME}
         RUNTIME DESTINATION "${WOTWR_INSTALL_DIR}"

diff --git a/projects/Injector/CMakeLists.txt b/projects/Injector/CMakeLists.txt
@@ -50,6 +50,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES};")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 target_link_libraries(
         ${PROJECT_NAME}
         Common

diff --git a/projects/Modloader/CMakeLists.txt b/projects/Modloader/CMakeLists.txt
@@ -114,6 +114,7 @@ find_library(DETOURS_LIBRARY detours REQUIRED)
 target_include_directories(${PROJECT_NAME} PRIVATE ${DETOURS_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} ${DETOURS_LIBRARY})
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
 
 message(STATUS "Assigning source groups.")
 

diff --git a/projects/Randomizer/CMakeLists.txt b/projects/Randomizer/CMakeLists.txt
@@ -356,6 +356,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES}")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 install(
         TARGETS ${PROJECT_NAME}
         RUNTIME DESTINATION "${WOTWR_INSTALL_DIR}"

diff --git a/projects/RandomizerTester/CMakeLists.txt b/projects/RandomizerTester/CMakeLists.txt
@@ -71,6 +71,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES}")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 message(STATUS "TESTING ${PROJECT_BINARY_DIR}")
 
 install(

diff --git a/projects/TAS/CMakeLists.txt b/projects/TAS/CMakeLists.txt
@@ -96,6 +96,8 @@ message(STATUS "Assigning source groups.")
 set_vc_structure("${CMAKE_CURRENT_SOURCE_DIR}" "${SOURCE_FILES};${PUBLIC_HEADER_FILES};${MISC_FILES}")
 set_vc_structure_with_prefix("_project_settings" "${CMAKE_CURRENT_SOURCE_DIR}" "${MISC_FILES};")
 
+target_compile_options(${PROJECT_NAME} PRIVATE /D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
 message(STATUS "TESTING ${PROJECT_BINARY_DIR}")
 
 install(

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -0,0 +1,3 @@
+{
+  "overlay-triplets": [ "./vcpkg-triplets" ]
+}
diff --git a/vcpkg-triplets/x64-windows-static-md.cmake b/vcpkg-triplets/x64-windows-static-md.cmake
@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CXX_FLAGS "/D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
+set(VCPKG_C_FLAGS "")