Switch vc6 generator to ninja

barefootlogician · barefootlogician · commit 85be5296f203 · 2025-07-01T19:49:35.000-05:00
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -9,7 +9,7 @@
         {
             "name": "vc6",
             "displayName": "Windows 32bit VC6 Release",
-            "generator": "NMake Makefiles",
+            "generator": "Ninja",
             "hidden": false,
             "binaryDir": "${sourceDir}/build/${presetName}",
             "environment": {
@@ -21,7 +21,7 @@
             "cacheVariables": {
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
                 "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL",
-                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "$<$<CONFIG:Release,Debug,RelWithDebInfo>:ProgramDatabase>",
+                "CMAKE_MSVC_DEBUG_INFORMATION_FORMAT": "",
                 "CMAKE_BUILD_TYPE": "Release",
                 "RTS_FLAGS": "/W3"
             },
diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake
@@ -36,6 +36,13 @@ if (NOT IS_VS6_BUILD)
         # Enforce strict __cplusplus version
         add_compile_options(/Zc:__cplusplus)
     endif()
+else()
+    # Define two pools: 'compile' with plenty of slots, 'link' with just one
+    set_property(GLOBAL PROPERTY JOB_POOLS compile=0 link=1)
+    # Tell CMake that all compile steps go into 'compile'
+    set(CMAKE_JOB_POOL_COMPILE compile)
+    # and all link steps go into 'link' (so only one link ever runs since vc6 can't handle multithreaded linking)
+    set(CMAKE_JOB_POOL_LINK link)
 endif()
 
 if(RTS_BUILD_OPTION_ASAN)
