Skip to content

Commit 957ee5c

Browse files
walbournwalbourn
authored
Removed ARM64 from VS 2019 projects (#358)
1 parent ad754f3 commit 957ee5c

11 files changed

+28
-112
lines changed

‎CMakePresets.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,9 @@
367367
{ "name": "x86-Debug-Redist-Clang" , "description": "Clang/LLVM for x86 (Debug) with XAudio2Redist", "inherits": [ "base", "x86", "Debug", "Clang", "Clang-X86", "XAudio2Redist", "VCPKG", "X64_X86" ] },
368368
{ "name": "x86-Release-Redist-Clang", "description": "Clang/LLVM for x86 (Release) with XAudio2Redist", "inherits": [ "base", "x86", "Release", "Clang", "Clang-X86", "XAudio2Redist", "VCPKG", "X64_X86" ] },
369369

370+
{ "name": "x64-Debug-GDK-Clang" , "description": "Clang/LLVM for x64 (Debug) using GameInput", "inherits": [ "base", "x64", "Debug", "MSVC", "Clang", "GDK" ] },
371+
{ "name": "x64-Release-GDK-Clang" , "description": "Clang/LLVM for x64 (Release) using GameInput", "inherits": [ "base", "x64", "Release", "MSVC", "Clang", "GDK" ] },
372+
370373
{ "name": "x64-Debug-Scarlett-Clang" , "description": "Clang/LLVM for x64 (Debug) for Xbox Series X|S", "inherits": [ "base", "x64", "Debug", "Clang", "Scarlett" ] },
371374
{ "name": "x64-Release-Scarlett-Clang", "description": "Clang/LLVM for x64 (Release) for Xbox Series X|S", "inherits": [ "base", "x64", "Release", "Clang", "Scarlett" ] },
372375

‎DirectXTK_Desktop_2019_Win10.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
EndProject
1313
Global
1414
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15-
Debug|ARM64 = Debug|ARM64
1615
Debug|x64 = Debug|x64
1716
Debug|x86 = Debug|x86
18-
Release|ARM64 = Release|ARM64
1917
Release|x64 = Release|x64
2018
Release|x86 = Release|x86
2119
EndGlobalSection
2220
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM64.ActiveCfg = Debug|ARM64
24-
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|ARM64.Build.0 = Debug|ARM64
2521
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x64.ActiveCfg = Debug|x64
2622
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x64.Build.0 = Debug|x64
2723
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x86.ActiveCfg = Debug|Win32
2824
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Debug|x86.Build.0 = Debug|Win32
29-
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM64.ActiveCfg = Release|ARM64
30-
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|ARM64.Build.0 = Release|ARM64
3125
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x64.ActiveCfg = Release|x64
3226
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x64.Build.0 = Release|x64
3327
{3E0E8608-CD9B-4C76-AF33-29CA38F2C9F0}.Release|x86.ActiveCfg = Release|Win32

‎DirectXTK_Desktop_2019_Win10.vcxproj‎

Lines changed: 2 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|ARM64">
5-
<Configuration>Debug</Configuration>
6-
<Platform>ARM64</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|Win32">
95
<Configuration>Debug</Configuration>
106
<Platform>Win32</Platform>
@@ -13,10 +9,6 @@
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
1511
</ProjectConfiguration>
16-
<ProjectConfiguration Include="Release|ARM64">
17-
<Configuration>Release</Configuration>
18-
<Platform>ARM64</Platform>
19-
</ProjectConfiguration>
2012
<ProjectConfiguration Include="Release|Win32">
2113
<Configuration>Release</Configuration>
2214
<Platform>Win32</Platform>
@@ -117,9 +109,7 @@
117109
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
118110
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
119111
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
120-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
121112
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
122-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
123113
</ClCompile>
124114
<ClCompile Include="Src\ResourceUploadBatch.cpp" />
125115
<ClCompile Include="Src\ScreenGrab.cpp" />
@@ -208,12 +198,6 @@
208198
<PlatformToolset>v142</PlatformToolset>
209199
<CharacterSet>Unicode</CharacterSet>
210200
</PropertyGroup>
211-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
212-
<ConfigurationType>StaticLibrary</ConfigurationType>
213-
<UseDebugLibraries>true</UseDebugLibraries>
214-
<PlatformToolset>v142</PlatformToolset>
215-
<CharacterSet>Unicode</CharacterSet>
216-
</PropertyGroup>
217201
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
218202
<ConfigurationType>StaticLibrary</ConfigurationType>
219203
<UseDebugLibraries>true</UseDebugLibraries>
@@ -226,12 +210,6 @@
226210
<PlatformToolset>v142</PlatformToolset>
227211
<CharacterSet>Unicode</CharacterSet>
228212
</PropertyGroup>
229-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
230-
<ConfigurationType>StaticLibrary</ConfigurationType>
231-
<UseDebugLibraries>false</UseDebugLibraries>
232-
<PlatformToolset>v142</PlatformToolset>
233-
<CharacterSet>Unicode</CharacterSet>
234-
</PropertyGroup>
235213
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
236214
<ConfigurationType>StaticLibrary</ConfigurationType>
237215
<UseDebugLibraries>false</UseDebugLibraries>
@@ -244,18 +222,12 @@
244222
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
245223
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
246224
</ImportGroup>
247-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
248-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
249-
</ImportGroup>
250225
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
251226
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
252227
</ImportGroup>
253228
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
254229
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
255230
</ImportGroup>
256-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
257-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
258-
</ImportGroup>
259231
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
260232
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
261233
</ImportGroup>
@@ -275,21 +247,11 @@
275247
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
276248
<TargetName>DirectXTK12</TargetName>
277249
</PropertyGroup>
278-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
279-
<OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</OutDir>
280-
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
281-
<TargetName>DirectXTK12</TargetName>
282-
</PropertyGroup>
283250
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
284251
<OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</OutDir>
285252
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
286253
<TargetName>DirectXTK12</TargetName>
287254
</PropertyGroup>
288-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
289-
<OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</OutDir>
290-
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)\</IntDir>
291-
<TargetName>DirectXTK12</TargetName>
292-
</PropertyGroup>
293255
<PropertyGroup Condition="'$(SpectreMitigation)'!='' AND '$(SpectreMitigation)'!='false'">
294256
<OutDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</OutDir>
295257
<IntDir>Bin\Desktop_2019_Win10\$(Platform)\$(Configuration)Spectre\</IntDir>
@@ -322,33 +284,6 @@
322284
<GenerateDebugInformation>true</GenerateDebugInformation>
323285
</Link>
324286
</ItemDefinitionGroup>
325-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
326-
<ClCompile>
327-
<PrecompiledHeader>Use</PrecompiledHeader>
328-
<WarningLevel>EnableAllWarnings</WarningLevel>
329-
<Optimization>Disabled</Optimization>
330-
<PreprocessorDefinitions>_WIN32_WINNT=0x0A00;WIN32;_DEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
331-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
332-
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
333-
<FloatingPointModel>Fast</FloatingPointModel>
334-
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
335-
<SDLCheck>true</SDLCheck>
336-
<ConformanceMode>true</ConformanceMode>
337-
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
338-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
339-
<SupportJustMyCode>false</SupportJustMyCode>
340-
<ExternalWarningLevel>Level4</ExternalWarningLevel>
341-
</ClCompile>
342-
<FXCompile>
343-
<ShaderModel>6.0</ShaderModel>
344-
<EnableDebuggingInformation>true</EnableDebuggingInformation>
345-
<AdditionalOptions>/Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions)</AdditionalOptions>
346-
</FXCompile>
347-
<Link>
348-
<SubSystem>Windows</SubSystem>
349-
<GenerateDebugInformation>true</GenerateDebugInformation>
350-
</Link>
351-
</ItemDefinitionGroup>
352287
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
353288
<ClCompile>
354289
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -405,34 +340,6 @@
405340
<OptimizeReferences>true</OptimizeReferences>
406341
</Link>
407342
</ItemDefinitionGroup>
408-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
409-
<ClCompile>
410-
<WarningLevel>EnableAllWarnings</WarningLevel>
411-
<PrecompiledHeader>Use</PrecompiledHeader>
412-
<Optimization>MaxSpeed</Optimization>
413-
<PreprocessorDefinitions>_WIN32_WINNT=0x0A00;WIN32;NDEBUG;_LIB;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
414-
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
415-
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
416-
<FloatingPointModel>Fast</FloatingPointModel>
417-
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
418-
<SDLCheck>true</SDLCheck>
419-
<ConformanceMode>true</ConformanceMode>
420-
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
421-
<ExternalWarningLevel>Level4</ExternalWarningLevel>
422-
<GuardEHContMetadata>true</GuardEHContMetadata>
423-
</ClCompile>
424-
<FXCompile>
425-
<ShaderModel>6.0</ShaderModel>
426-
<EnableDebuggingInformation>true</EnableDebuggingInformation>
427-
<AdditionalOptions>/Fd "$(OutDir)%(Filename).pdb" %(AdditionalOptions)</AdditionalOptions>
428-
</FXCompile>
429-
<Link>
430-
<SubSystem>Windows</SubSystem>
431-
<GenerateDebugInformation>true</GenerateDebugInformation>
432-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
433-
<OptimizeReferences>true</OptimizeReferences>
434-
</Link>
435-
</ItemDefinitionGroup>
436343
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
437344
<ClCompile>
438345
<WarningLevel>EnableAllWarnings</WarningLevel>
@@ -469,7 +376,7 @@
469376
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
470377
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
471378
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
472-
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
379+
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0'))</_ATGFXCVer>
473380
<_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
474381
</PropertyGroup>
475382
<Exec Condition="!Exists('Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)Src/Shaders" Command="CompileShaders dxil" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Src/Shaders/Compiled" LogStandardErrorAsError="true" />

‎DirectXTK_Desktop_2022_Win10.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM64">
55
<Configuration>Debug</Configuration>

‎DirectXTK_GDKX_2022.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Gaming.Xbox.Scarlett.x64">
55
<Configuration>Debug</Configuration>
@@ -721,7 +721,7 @@
721721
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
722722
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
723723
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
724-
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
724+
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0'))</_ATGFXCVer>
725725
<_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
726726
</PropertyGroup>
727727
<Exec Condition="!Exists('Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)Src/Shaders" Command="CompileShaders dxil" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Src/Shaders/Compiled" LogStandardErrorAsError="true" />

‎DirectXTK_GDK_2019.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Gaming.Xbox.Scarlett.x64">
55
<Configuration>Debug</Configuration>
@@ -692,7 +692,7 @@
692692
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
693693
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
694694
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
695-
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
695+
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0'))</_ATGFXCVer>
696696
<_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
697697
</PropertyGroup>
698698
<Exec Condition="!Exists('Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)Src/Shaders" Command="CompileShaders dxil" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Src/Shaders/Compiled" LogStandardErrorAsError="true" />

‎DirectXTK_GDK_2022.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Gaming.Xbox.Scarlett.x64">
55
<Configuration>Debug</Configuration>
@@ -692,7 +692,7 @@
692692
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
693693
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
694694
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
695-
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
695+
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0'))</_ATGFXCVer>
696696
<_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
697697
</PropertyGroup>
698698
<Exec Condition="!Exists('Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)Src/Shaders" Command="CompileShaders dxil" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Src/Shaders/Compiled" LogStandardErrorAsError="true" />

‎DirectXTK_Windows10_2022.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
<_ATGFXCPath>$(WindowsSDK_ExecutablePath_x64.Split(';')[0])</_ATGFXCPath>
478478
<_ATGFXCPath>$(_ATGFXCPath.Replace("x64",""))</_ATGFXCPath>
479479
<_ATGFXCPath Condition="'$(_ATGFXCPath)' != '' and !HasTrailingSlash('$(_ATGFXCPath)')">$(_ATGFXCPath)\</_ATGFXCPath>
480-
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), `10\.0\.\d+\.0`))</_ATGFXCVer>
480+
<_ATGFXCVer>$([System.Text.RegularExpressions.Regex]::Match($(_ATGFXCPath), '10\.0\.\d+\.0'))</_ATGFXCVer>
481481
<_ATGFXCVer Condition="'$(_ATGFXCVer)' != '' and !HasTrailingSlash('$(_ATGFXCVer)')">$(_ATGFXCVer)\</_ATGFXCVer>
482482
</PropertyGroup>
483483
<Exec Condition="!Exists('Src/Shaders/Compiled/SpriteEffect_SpriteVertexShader.inc')" WorkingDirectory="$(ProjectDir)Src/Shaders" Command="CompileShaders dxil" EnvironmentVariables="WindowsSdkVerBinPath=$(_ATGFXCPath);WindowsSDKVersion=$(_ATGFXCVer);CompileShadersOutput=$(ProjectDir)Src/Shaders/Compiled" LogStandardErrorAsError="true" />

‎Src/GamePad.cpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ using namespace GameInput::v3;
9898

9999
using GameInputCreateFn = HRESULT(*)(IGameInput**);
100100

101+
#ifdef __clang__
102+
#pragma clang diagnostic ignored "-Wmicrosoft-cast"
103+
#endif
104+
101105
class GamePad::Impl
102106
{
103107
public:
@@ -122,7 +126,7 @@ class GamePad::Impl
122126
s_gameInputModule = LoadLibraryExW(L"GameInput.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
123127
if (s_gameInputModule)
124128
{
125-
s_gameInputCreate = reinterpret_cast<GameInputCreateFn>(static_cast<void*>(GetProcAddress(s_gameInputModule, "GameInputCreate")));
129+
s_gameInputCreate = reinterpret_cast<GameInputCreateFn>(reinterpret_cast<void*>(GetProcAddress(s_gameInputModule, "GameInputCreate")));
126130
}
127131

128132
if (!s_gameInputCreate)

0 commit comments

Comments
 (0)