Bump cache version

.github/workflows/ci-build.yml

@@ -337,7 +337,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: out
-          key: windows-${{ matrix.arch }}-cmake-v3
+          key: windows-${{ matrix.arch }}-cmake-v4
 
       - name: Configure
         shell: cmd

CMakeLists.txt

@@ -314,7 +314,7 @@ endif()
 if(WIN32)
     target_link_libraries(${EXECUTABLE_NAME}
         winmm
-        libcpmt
+       #  libcpmt # Disabled, was causing issues on VS2019 builing from UI
     )
 endif()
 
@@ -325,6 +325,10 @@ if(WIN32)
     )
 endif()
 
+if (MSVC AND CMAKE_GENERATOR_TOOLSET STREQUAL "v141_xp")
+  add_definitions(-DTOOLSET_V141_XP)
+endif()
+
 if(APPLE)
     if(IOS)
         set(RESOURCES

CMakePresets.json

@@ -30,8 +30,8 @@
             ],
             "generator": "Visual Studio 16 2019",
             "architecture": "Win32",
+            "toolset": "v141_xp",
             "cacheVariables": {
-                "CMAKE_GENERATOR_TOOLSET": "v141_xp",
                 "CMAKE_C_FLAGS": "/D_WIN32_WINNT=0x0501",
                 "CMAKE_CXX_FLAGS": "/D_WIN32_WINNT=0x0501 /D_STATIC_CPPLIB",
                 "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>"
@@ -61,7 +61,8 @@
             },
             "cacheVariables": {
                 "FALLOUT_VENDORED": "OFF"
-            }
+            },
+            "generator": "Unix Makefiles"
         },
         {
             "name": "linux-x86-base",
@@ -74,8 +75,7 @@
                 "CMAKE_CXX_FLAGS": "-m32",
                 "CMAKE_SYSTEM_NAME": "Linux",
                 "CMAKE_SYSTEM_PROCESSOR": "i386"
-            },
-            "generator": "Unix Makefiles"
+            }
         },
         {
             "name": "linux-x86-debug",

src/win32.cc

@@ -16,6 +16,19 @@
 #include "platform/ios/paths.h"
 #endif
 
+#if defined(_WIN32) && !defined(_WIN64)
+#ifndef _WIN32_WINNT
+#error "_WIN32_WINNT is not defined. It must be set to 0x0501 for Windows XP compatibility."
+#elif _WIN32_WINNT != 0x0501
+#error "_WIN32_WINNT must be exactly 0x0501 for Windows XP compatibility in 32-bit builds."
+#endif
+
+#ifndef TOOLSET_V141_XP
+#error "TOOLSET_V141_XP is not used."
+#endif
+
+#endif
+
 namespace fallout {
 
 // 0x51E444