Code review

Author: walbourn

.github/workflows/main.yml

@@ -71,10 +71,10 @@ jobs:
             build_type: x86-Release-Clang
             arch: amd64_x86
           - toolver: '14'
-            build_type: x64-Debug-VS
+            build_type: x64-VS
             arch: amd64
           - toolver: '14'
-            build_type: x86-Debug-VS
+            build_type: x86-VS
             arch: amd64_x86
 
     steps:

CMakeLists.txt

@@ -442,12 +442,11 @@ if(directxmath_FOUND)
     endforeach()
 endif()
 
-if(TOOL_EXES)
-  message(STATUS "Building tools: ${TOOL_EXES}")
-endif()
-
 if (BUILD_TOOLS AND (CMAKE_GENERATOR MATCHES "Visual Studio"))
+  message(STATUS "Building tools: MakeSpriteFont;${TOOL_EXES}")
   add_subdirectory(MakeSpriteFont)
+elseif(TOOL_EXES)
+  message(STATUS "Building tools: ${TOOL_EXES}")
 endif()
 
 # Model uses dynamic_cast, so we need /GR (Enable RTTI)

CMakePresets.json

@@ -258,11 +258,6 @@
     { "name": "x86-Debug"    , "description": "MSVC for x86 (Debug) for Windows 8", "inherits": [ "base", "x86", "Debug", "MSVC" ] },
     { "name": "x86-Release"  , "description": "MSVC for x86 (Release) for Windows 8", "inherits": [ "base", "x86", "Release", "MSVC" ] },
 
-    { "name": "x64-Debug-VS"    , "description": "MSVC for x64 (Debug) w/ MakeSpriteFont", "inherits": [ "vsbase", "x64", "Debug", "MSVC" ] },
-    { "name": "x64-Release-VS"  , "description": "MSVC for x64 (Release) w/ MakeSpriteFont", "inherits": [ "vsbase", "x64", "Release", "MSVC" ] },
-    { "name": "x86-Debug-VS"    , "description": "MSVC for x86 (Debug) w/ MakeSpriteFont", "inherits": [ "vsbase", "x86", "Debug", "MSVC" ] },
-    { "name": "x86-Release-VS"  , "description": "MSVC for x86 (Release) w/ MakeSpriteFont", "inherits": [ "vsbase", "x86", "Release", "MSVC" ] },
-
     { "name": "x64-Debug-Win10"   , "description": "MSVC for x64 (Debug) for Windows 10", "inherits": [ "base", "x64", "Debug", "MSVC", "Win10" ] },
     { "name": "x64-Release-Win10" , "description": "MSVC for x64 (Release) for Windows 10", "inherits": [ "base", "x64", "Release", "MSVC", "Win10" ] },
     { "name": "x86-Debug-Win10"   , "description": "MSVC for x86 (Debug) for Windows 10", "inherits": [ "base", "x86", "Debug", "MSVC", "Win10" ] },
@@ -273,6 +268,9 @@
     { "name": "arm64ec-Debug"   , "description": "MSVC for ARM64EC (Debug) for Windows 10", "inherits": [ "base", "ARM64EC", "Debug", "MSVC", "Win10" ] },
     { "name": "arm64ec-Release" , "description": "MSVC for ARM64EC (Release) for Windows 10", "inherits": [ "base", "ARM64EC", "Release", "MSVC", "Win10" ] },
 
+    { "name": "x64-VS"  , "description": "MSVC for x64 w/ Visual Studio generator", "inherits": [ "vsbase", "x64", "MSVC" ] },
+    { "name": "x86-VS"  , "description": "MSVC for x86 w/ Visual Studio generator", "inherits": [ "vsbase", "x86", "MSVC" ] },
+
     { "name": "x64-Debug-UWP"    , "description": "MSVC for x64 (Debug) for UWP", "inherits": [ "base", "x64", "Debug", "MSVC", "UWP" ] },
     { "name": "x64-Release-UWP"  , "description": "MSVC for x64 (Release) for UWP", "inherits": [ "base", "x64", "Release", "MSVC", "UWP" ] },
     { "name": "x86-Debug-UWP"    , "description": "MSVC for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "MSVC", "UWP" ] },