From 8a92db29c93a1e17e5d39fa9bc2120554f661734 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 28 Oct 2025 12:12:37 -0700 Subject: [PATCH 1/4] Minor code review feedback from CoPilot --- DirectXTK_Desktop_2019.vcxproj | 2 +- DirectXTK_Desktop_2019_Win10.vcxproj | 2 +- DirectXTK_Desktop_2022.vcxproj | 2 +- DirectXTK_Desktop_2022_Win10.vcxproj | 2 +- DirectXTK_GDK_2019.vcxproj | 2 +- DirectXTK_GDK_2022.vcxproj | 2 +- DirectXTK_Windows10_2022.vcxproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DirectXTK_Desktop_2019.vcxproj b/DirectXTK_Desktop_2019.vcxproj index 73eb71e65..16e653177 100644 --- a/DirectXTK_Desktop_2019.vcxproj +++ b/DirectXTK_Desktop_2019.vcxproj @@ -352,7 +352,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ diff --git a/DirectXTK_Desktop_2019_Win10.vcxproj b/DirectXTK_Desktop_2019_Win10.vcxproj index deffe5aff..df76ce1cf 100644 --- a/DirectXTK_Desktop_2019_Win10.vcxproj +++ b/DirectXTK_Desktop_2019_Win10.vcxproj @@ -435,7 +435,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ diff --git a/DirectXTK_Desktop_2022.vcxproj b/DirectXTK_Desktop_2022.vcxproj index dec8c7e3d..9fa8ad466 100644 --- a/DirectXTK_Desktop_2022.vcxproj +++ b/DirectXTK_Desktop_2022.vcxproj @@ -352,7 +352,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ diff --git a/DirectXTK_Desktop_2022_Win10.vcxproj b/DirectXTK_Desktop_2022_Win10.vcxproj index 27aef4acb..55d43f355 100644 --- a/DirectXTK_Desktop_2022_Win10.vcxproj +++ b/DirectXTK_Desktop_2022_Win10.vcxproj @@ -435,7 +435,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ diff --git a/DirectXTK_GDK_2019.vcxproj b/DirectXTK_GDK_2019.vcxproj index e0eec539f..964d5813f 100644 --- a/DirectXTK_GDK_2019.vcxproj +++ b/DirectXTK_GDK_2019.vcxproj @@ -305,7 +305,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ diff --git a/DirectXTK_GDK_2022.vcxproj b/DirectXTK_GDK_2022.vcxproj index 69cac35d9..b080d8594 100644 --- a/DirectXTK_GDK_2022.vcxproj +++ b/DirectXTK_GDK_2022.vcxproj @@ -305,7 +305,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ diff --git a/DirectXTK_Windows10_2022.vcxproj b/DirectXTK_Windows10_2022.vcxproj index 699f86899..d1f107a48 100644 --- a/DirectXTK_Windows10_2022.vcxproj +++ b/DirectXTK_Windows10_2022.vcxproj @@ -444,7 +444,7 @@ <_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0]) <_ATGFXCPath>$(_ATGFXCPath.Replace("x64","")) <_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\ - <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`)) + <_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0')) <_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\ From b7aab4bc568b06e79e95b8cc36e2250cce54ea01 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 29 Oct 2025 16:41:51 -0700 Subject: [PATCH 2/4] Remove ARM64 from VS 2019 projects --- DirectXTK_Desktop_2019_Win10.sln | 42 +++++--------- DirectXTK_Desktop_2019_Win10.vcxproj | 83 ---------------------------- XWBTool/xwbtool_Desktop_2019.vcxproj | 77 -------------------------- 3 files changed, 14 insertions(+), 188 deletions(-) diff --git a/DirectXTK_Desktop_2019_Win10.sln b/DirectXTK_Desktop_2019_Win10.sln index 7ee5aaba1..d0e1fe1a2 100644 --- a/DirectXTK_Desktop_2019_Win10.sln +++ b/DirectXTK_Desktop_2019_Win10.sln @@ -16,64 +16,50 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Debug|x64 = Debug|x64 - Release|ARM64 = Release|ARM64 + Debug|x86 = Debug|x86 Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|ARM64.Build.0 = Debug|ARM64 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|ARM64.ActiveCfg = Release|ARM64 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|ARM64.Build.0 = Release|ARM64 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.Build.0 = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 - {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64 {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64 - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|ARM64.Build.0 = Debug|Any CPU + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32 + {E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32 {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.ActiveCfg = Debug|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.Build.0 = Debug|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|ARM64.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|ARM64.Build.0 = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU - {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.ActiveCfg = Release|Any CPU {7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.Build.0 = Release|Any CPU - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|ARM64.Build.0 = Debug|ARM64 + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU + {7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.ActiveCfg = Debug|x64 {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.Build.0 = Debug|x64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|ARM64.ActiveCfg = Release|ARM64 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|ARM64.Build.0 = Release|ARM64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32 {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.Build.0 = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 - {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64 {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32 + {C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DirectXTK_Desktop_2019_Win10.vcxproj b/DirectXTK_Desktop_2019_Win10.vcxproj index df76ce1cf..a4116bd0b 100644 --- a/DirectXTK_Desktop_2019_Win10.vcxproj +++ b/DirectXTK_Desktop_2019_Win10.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM64 - Debug Win32 @@ -13,10 +9,6 @@ Debug x64 - - Release - ARM64 - Release Win32 @@ -109,9 +101,7 @@ Create Create Create - Create Create - Create @@ -204,12 +194,6 @@ v142 Unicode - - StaticLibrary - true - v142 - Unicode - StaticLibrary true @@ -222,12 +206,6 @@ v142 Unicode - - StaticLibrary - false - v142 - Unicode - StaticLibrary false @@ -240,18 +218,12 @@ - - - - - - @@ -271,21 +243,11 @@ Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ DirectXTK - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - DirectXTK - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ DirectXTK - - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\ - DirectXTK - Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\ Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\ @@ -313,28 +275,6 @@ true - - - Use - EnableAllWarnings - Disabled - _WIN32_WINNT=0x0A00;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Windows - true - - Use @@ -381,29 +321,6 @@ true - - - EnableAllWarnings - Use - MaxSpeed - _WIN32_WINNT=0x0A00;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - pch.h - $(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories) - Fast - $(IntDir)$(TargetName).pdb - true - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - true - - - Windows - true - true - true - - EnableAllWarnings diff --git a/XWBTool/xwbtool_Desktop_2019.vcxproj b/XWBTool/xwbtool_Desktop_2019.vcxproj index 2841f6abe..2fa3a5e38 100644 --- a/XWBTool/xwbtool_Desktop_2019.vcxproj +++ b/XWBTool/xwbtool_Desktop_2019.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM64 - Debug Win32 @@ -13,10 +9,6 @@ Debug x64 - - Release - ARM64 - Release Win32 @@ -47,13 +39,6 @@ Unicode false - - Application - true - v142 - Unicode - false - Application false @@ -66,12 +51,6 @@ v142 Unicode - - Application - false - v142 - Unicode - @@ -81,18 +60,12 @@ - - - - - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ @@ -104,11 +77,6 @@ Bin\Desktop_2019\$(Platform)\$(Configuration)\ XWBTool - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - XWBTool - Bin\Desktop_2019\$(Platform)\$(Configuration)\ Bin\Desktop_2019\$(Platform)\$(Configuration)\ @@ -119,11 +87,6 @@ Bin\Desktop_2019\$(Platform)\$(Configuration)\ XWBTool - - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - Bin\Desktop_2019\$(Platform)\$(Configuration)\ - XWBTool - Level4 @@ -165,25 +128,6 @@ /CETCOMPAT %(AdditionalOptions) - - - Level4 - Disabled - WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions) - ..\Audio;..\Src;%(AdditionalIncludeDirectories) - true - false - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - 26812 - ProgramDatabase - stdcpp17 - - - Console - true - kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) - - Level4 @@ -229,27 +173,6 @@ /CETCOMPAT %(AdditionalOptions) - - - Level4 - MaxSpeed - WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0A00;%(PreprocessorDefinitions) - ..\Audio;..\Src;%(AdditionalIncludeDirectories) - Guard - true - false - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - 26812 - stdcpp17 - - - Console - true - true - true - kernel32.lib;user32.lib;version.lib;%(AdditionalDependencies) - - From a339c2b8f97d45585f92d1e040703e9c141ee66d Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 29 Oct 2025 17:42:19 -0700 Subject: [PATCH 3/4] Remove ToolsVersion in vcxproj which is obsolete since VS 2017 --- DirectXTK_Desktop_2019.vcxproj | 2 +- DirectXTK_Desktop_2019_Win10.vcxproj | 2 +- DirectXTK_Desktop_2022.vcxproj | 2 +- DirectXTK_Desktop_2022_Win10.vcxproj | 2 +- DirectXTK_GDK_2019.vcxproj | 2 +- DirectXTK_GDK_2022.vcxproj | 2 +- XWBTool/xwbtool_Desktop_2019.vcxproj | 2 +- XWBTool/xwbtool_Desktop_2022.vcxproj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DirectXTK_Desktop_2019.vcxproj b/DirectXTK_Desktop_2019.vcxproj index 16e653177..c9318e2a6 100644 --- a/DirectXTK_Desktop_2019.vcxproj +++ b/DirectXTK_Desktop_2019.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/DirectXTK_Desktop_2019_Win10.vcxproj b/DirectXTK_Desktop_2019_Win10.vcxproj index a4116bd0b..269761480 100644 --- a/DirectXTK_Desktop_2019_Win10.vcxproj +++ b/DirectXTK_Desktop_2019_Win10.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/DirectXTK_Desktop_2022.vcxproj b/DirectXTK_Desktop_2022.vcxproj index 9fa8ad466..d03abf3d5 100644 --- a/DirectXTK_Desktop_2022.vcxproj +++ b/DirectXTK_Desktop_2022.vcxproj @@ -1,5 +1,5 @@ - + Debug diff --git a/DirectXTK_Desktop_2022_Win10.vcxproj b/DirectXTK_Desktop_2022_Win10.vcxproj index 55d43f355..8ff0f6c1d 100644 --- a/DirectXTK_Desktop_2022_Win10.vcxproj +++ b/DirectXTK_Desktop_2022_Win10.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/DirectXTK_GDK_2019.vcxproj b/DirectXTK_GDK_2019.vcxproj index 964d5813f..c6d1105ab 100644 --- a/DirectXTK_GDK_2019.vcxproj +++ b/DirectXTK_GDK_2019.vcxproj @@ -1,5 +1,5 @@  - + Release diff --git a/DirectXTK_GDK_2022.vcxproj b/DirectXTK_GDK_2022.vcxproj index b080d8594..0e9b32c8a 100644 --- a/DirectXTK_GDK_2022.vcxproj +++ b/DirectXTK_GDK_2022.vcxproj @@ -1,5 +1,5 @@  - + Release diff --git a/XWBTool/xwbtool_Desktop_2019.vcxproj b/XWBTool/xwbtool_Desktop_2019.vcxproj index 2fa3a5e38..692de5db5 100644 --- a/XWBTool/xwbtool_Desktop_2019.vcxproj +++ b/XWBTool/xwbtool_Desktop_2019.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/XWBTool/xwbtool_Desktop_2022.vcxproj b/XWBTool/xwbtool_Desktop_2022.vcxproj index 385e2342f..e18336808 100644 --- a/XWBTool/xwbtool_Desktop_2022.vcxproj +++ b/XWBTool/xwbtool_Desktop_2022.vcxproj @@ -1,5 +1,5 @@  - + Debug From bb3ff0f78ead03575e2a7847d479536274b6b1a5 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 30 Oct 2025 11:40:17 -0700 Subject: [PATCH 4/4] Ensure -Wmicrosoft-cast is ignored --- Src/GamePad.cpp | 6 +++++- Src/Keyboard.cpp | 6 +++++- Src/Mouse.cpp | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Src/GamePad.cpp b/Src/GamePad.cpp index 58ae1cde4..6db38799c 100644 --- a/Src/GamePad.cpp +++ b/Src/GamePad.cpp @@ -98,6 +98,10 @@ using namespace GameInput::v3; using GameInputCreateFn = HRESULT(*)(IGameInput**); +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wmicrosoft-cast" +#endif + class GamePad::Impl { public: @@ -122,7 +126,7 @@ class GamePad::Impl s_gameInputModule = LoadLibraryExW(L"GameInput.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); if (s_gameInputModule) { - s_gameInputCreate = reinterpret_cast(static_cast(GetProcAddress(s_gameInputModule, "GameInputCreate"))); + s_gameInputCreate = reinterpret_cast(reinterpret_cast(GetProcAddress(s_gameInputModule, "GameInputCreate"))); } if (!s_gameInputCreate) diff --git a/Src/Keyboard.cpp b/Src/Keyboard.cpp index 607f4633c..47f1a8551 100644 --- a/Src/Keyboard.cpp +++ b/Src/Keyboard.cpp @@ -65,6 +65,10 @@ using namespace GameInput::v3; using GameInputCreateFn = HRESULT(*)(IGameInput**); +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wmicrosoft-cast" +#endif + class Keyboard::Impl { public: @@ -89,7 +93,7 @@ class Keyboard::Impl s_gameInputModule = LoadLibraryExW(L"GameInput.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); if (s_gameInputModule) { - s_gameInputCreate = reinterpret_cast(static_cast(GetProcAddress(s_gameInputModule, "GameInputCreate"))); + s_gameInputCreate = reinterpret_cast(reinterpret_cast(GetProcAddress(s_gameInputModule, "GameInputCreate"))); } if (!s_gameInputCreate) diff --git a/Src/Mouse.cpp b/Src/Mouse.cpp index c4735cab8..df3dccc54 100644 --- a/Src/Mouse.cpp +++ b/Src/Mouse.cpp @@ -33,6 +33,10 @@ using namespace GameInput::v3; using GameInputCreateFn = HRESULT(*)(IGameInput**); +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wmicrosoft-cast" +#endif + // // Call this static function from your Window Message Procedure // @@ -93,7 +97,7 @@ class Mouse::Impl s_gameInputModule = LoadLibraryExW(L"GameInput.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); if (s_gameInputModule) { - s_gameInputCreate = reinterpret_cast(static_cast(GetProcAddress(s_gameInputModule, "GameInputCreate"))); + s_gameInputCreate = reinterpret_cast(reinterpret_cast(GetProcAddress(s_gameInputModule, "GameInputCreate"))); } if (!s_gameInputCreate)