Skip to content

Commit 37096d6

Browse files
walbournwalbourn
authored
AArch32 (ARM32) architecture deprecation (#400)
1 parent d993366 commit 37096d6

14 files changed

+2
-324
lines changed

‎.nuget/directxtk_uwp.nuspec

-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ WICTextureLoader - WIC-based image file texture loader</description>
4747

4848
<file target="include" src="Inc\*" exclude="Inc\XboxDDSTextureLoader.h" />
4949

50-
<file target="native\lib\ARM\Debug" src="Bin\Windows10_2019\ARM\Debug\*.lib" />
51-
<file target="native\lib\ARM\Debug" src="Bin\Windows10_2019\ARM\Debug\*.pdb" />
52-
53-
<file target="native\lib\ARM\Release" src="Bin\Windows10_2019\ARM\Release\*.lib" />
54-
<file target="native\lib\ARM\Release" src="Bin\Windows10_2019\ARM\Release\*.pdb" />
55-
5650
<file target="native\lib\ARM64\Debug" src="Bin\Windows10_2019\ARM64\Debug\*.lib" />
5751
<file target="native\lib\ARM64\Debug" src="Bin\Windows10_2019\ARM64\Debug\*.pdb" />
5852

‎CMakePresets.json

-11
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@
2929
"cacheVariables": { "DIRECTX_ARCH": "x86" },
3030
"hidden": true
3131
},
32-
{
33-
"name": "ARM",
34-
"architecture": {
35-
"value": "arm",
36-
"strategy": "external"
37-
},
38-
"cacheVariables": { "DIRECTX_ARCH": "arm" },
39-
"hidden": true
40-
},
4132
{
4233
"name": "ARM64",
4334
"architecture": {
@@ -192,8 +183,6 @@
192183
{ "name": "x64-Release-UWP" , "description": "MSVC for x64 (Release) for UWP", "inherits": [ "base", "x64", "Release", "MSVC", "UWP" ] },
193184
{ "name": "x86-Debug-UWP" , "description": "MSVC for x86 (Debug) for UWP", "inherits": [ "base", "x86", "Debug", "MSVC", "UWP" ] },
194185
{ "name": "x86-Release-UWP" , "description": "MSVC for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "MSVC", "UWP" ] },
195-
{ "name": "arm-Debug-UWP" , "description": "MSVC for ARM (Debug) for UWP", "inherits": [ "base", "ARM", "Debug", "MSVC", "UWP" ] },
196-
{ "name": "arm-Release-UWP" , "description": "MSVC for ARM (Release) for UWP", "inherits": [ "base", "ARM", "Release", "MSVC", "UWP" ] },
197186
{ "name": "arm64-Debug-UWP" , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] },
198187
{ "name": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] },
199188

‎DirectXTK_Windows10_2019.sln

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
4-
VisualStudioVersion = 15.0.27703.2000
4+
VisualStudioVersion = 16.0.33927.289
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_Windows10_2019.vcxproj", "{F4776924-619C-42C7-88B2-82C947CCC9E7}"
77
EndProject
@@ -12,26 +12,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1212
EndProject
1313
Global
1414
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15-
Debug|ARM = Debug|ARM
1615
Debug|ARM64 = Debug|ARM64
1716
Debug|x64 = Debug|x64
1817
Debug|x86 = Debug|x86
19-
Release|ARM = Release|ARM
2018
Release|ARM64 = Release|ARM64
2119
Release|x64 = Release|x64
2220
Release|x86 = Release|x86
2321
EndGlobalSection
2422
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.ActiveCfg = Debug|ARM
26-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.Build.0 = Debug|ARM
2723
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.ActiveCfg = Debug|ARM64
2824
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.Build.0 = Debug|ARM64
2925
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.ActiveCfg = Debug|x64
3026
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.Build.0 = Debug|x64
3127
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.ActiveCfg = Debug|Win32
3228
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.Build.0 = Debug|Win32
33-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM.ActiveCfg = Release|ARM
34-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM.Build.0 = Release|ARM
3529
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.ActiveCfg = Release|ARM64
3630
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.Build.0 = Release|ARM64
3731
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x64.ActiveCfg = Release|x64

‎DirectXTK_Windows10_2019.vcxproj

-82
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|ARM">
5-
<Configuration>Debug</Configuration>
6-
<Platform>ARM</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|ARM64">
95
<Configuration>Debug</Configuration>
106
<Platform>ARM64</Platform>
@@ -17,10 +13,6 @@
1713
<Configuration>Debug</Configuration>
1814
<Platform>x64</Platform>
1915
</ProjectConfiguration>
20-
<ProjectConfiguration Include="Release|ARM">
21-
<Configuration>Release</Configuration>
22-
<Platform>ARM</Platform>
23-
</ProjectConfiguration>
2416
<ProjectConfiguration Include="Release|ARM64">
2517
<Configuration>Release</Configuration>
2618
<Platform>ARM64</Platform>
@@ -127,9 +119,7 @@
127119
<ClCompile Include="Src\pch.cpp">
128120
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
129121
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
130-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
131122
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
132-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
133123
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
134124
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
135125
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
@@ -221,11 +211,6 @@
221211
<UseDebugLibraries>true</UseDebugLibraries>
222212
<PlatformToolset>v142</PlatformToolset>
223213
</PropertyGroup>
224-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
225-
<ConfigurationType>StaticLibrary</ConfigurationType>
226-
<UseDebugLibraries>true</UseDebugLibraries>
227-
<PlatformToolset>v142</PlatformToolset>
228-
</PropertyGroup>
229214
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
230215
<ConfigurationType>StaticLibrary</ConfigurationType>
231216
<UseDebugLibraries>true</UseDebugLibraries>
@@ -241,11 +226,6 @@
241226
<UseDebugLibraries>false</UseDebugLibraries>
242227
<PlatformToolset>v142</PlatformToolset>
243228
</PropertyGroup>
244-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
245-
<ConfigurationType>StaticLibrary</ConfigurationType>
246-
<UseDebugLibraries>false</UseDebugLibraries>
247-
<PlatformToolset>v142</PlatformToolset>
248-
</PropertyGroup>
249229
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
250230
<ConfigurationType>StaticLibrary</ConfigurationType>
251231
<UseDebugLibraries>false</UseDebugLibraries>
@@ -267,15 +247,9 @@
267247
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
268248
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
269249
</ImportGroup>
270-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
271-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
272-
</ImportGroup>
273250
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
274251
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
275252
</ImportGroup>
276-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
277-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
278-
</ImportGroup>
279253
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
280254
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
281255
</ImportGroup>
@@ -299,24 +273,12 @@
299273
<TargetName>DirectXTK</TargetName>
300274
<GenerateManifest>false</GenerateManifest>
301275
</PropertyGroup>
302-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
303-
<OutDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</OutDir>
304-
<IntDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</IntDir>
305-
<TargetName>DirectXTK</TargetName>
306-
<GenerateManifest>false</GenerateManifest>
307-
</PropertyGroup>
308276
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
309277
<OutDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</OutDir>
310278
<IntDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</IntDir>
311279
<TargetName>DirectXTK</TargetName>
312280
<GenerateManifest>false</GenerateManifest>
313281
</PropertyGroup>
314-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
315-
<OutDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</OutDir>
316-
<IntDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</IntDir>
317-
<TargetName>DirectXTK</TargetName>
318-
<GenerateManifest>false</GenerateManifest>
319-
</PropertyGroup>
320282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
321283
<OutDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</OutDir>
322284
<IntDir>Bin\Windows10_2019\$(Platform)\$(Configuration)\</IntDir>
@@ -381,29 +343,6 @@
381343
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
382344
</Link>
383345
</ItemDefinitionGroup>
384-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
385-
<ClCompile>
386-
<PrecompiledHeader>Use</PrecompiledHeader>
387-
<ForcedUsingFiles />
388-
<CompileAsWinRT>false</CompileAsWinRT>
389-
<SDLCheck>true</SDLCheck>
390-
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
391-
<FloatingPointModel>Fast</FloatingPointModel>
392-
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
393-
<WarningLevel>EnableAllWarnings</WarningLevel>
394-
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
395-
<ConformanceMode>true</ConformanceMode>
396-
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
397-
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
398-
<SupportJustMyCode>false</SupportJustMyCode>
399-
<ExternalWarningLevel>Level4</ExternalWarningLevel>
400-
</ClCompile>
401-
<Link>
402-
<SubSystem>Console</SubSystem>
403-
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
404-
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
405-
</Link>
406-
</ItemDefinitionGroup>
407346
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
408347
<ClCompile>
409348
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -428,27 +367,6 @@
428367
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
429368
</Link>
430369
</ItemDefinitionGroup>
431-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
432-
<ClCompile>
433-
<PrecompiledHeader>Use</PrecompiledHeader>
434-
<ForcedUsingFiles />
435-
<CompileAsWinRT>false</CompileAsWinRT>
436-
<SDLCheck>true</SDLCheck>
437-
<AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;$(ProjectDir)Src\Shaders\Compiled;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
438-
<FloatingPointModel>Fast</FloatingPointModel>
439-
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
440-
<WarningLevel>EnableAllWarnings</WarningLevel>
441-
<PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
442-
<ConformanceMode>true</ConformanceMode>
443-
<AdditionalOptions>/Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions)</AdditionalOptions>
444-
<ExternalWarningLevel>Level4</ExternalWarningLevel>
445-
</ClCompile>
446-
<Link>
447-
<SubSystem>Console</SubSystem>
448-
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
449-
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
450-
</Link>
451-
</ItemDefinitionGroup>
452370
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
453371
<ClCompile>
454372
<PrecompiledHeader>Use</PrecompiledHeader>

‎DirectXTK_Windows10_2022.sln

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
4-
VisualStudioVersion = 15.0.27703.2000
3+
VisualStudioVersion = 17.7.34009.444
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_Windows10_2022.vcxproj", "{F4776924-619C-42C7-88B2-82C947CCC9E7}"
76
EndProject
@@ -12,26 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1211
EndProject
1312
Global
1413
GlobalSection(SolutionConfigurationPlatforms) = preSolution
15-
Debug|ARM = Debug|ARM
1614
Debug|ARM64 = Debug|ARM64
1715
Debug|x64 = Debug|x64
1816
Debug|x86 = Debug|x86
19-
Release|ARM = Release|ARM
2017
Release|ARM64 = Release|ARM64
2118
Release|x64 = Release|x64
2219
Release|x86 = Release|x86
2320
EndGlobalSection
2421
GlobalSection(ProjectConfigurationPlatforms) = postSolution
25-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.ActiveCfg = Debug|ARM
26-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM.Build.0 = Debug|ARM
2722
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.ActiveCfg = Debug|ARM64
2823
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.Build.0 = Debug|ARM64
2924
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.ActiveCfg = Debug|x64
3025
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.Build.0 = Debug|x64
3126
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.ActiveCfg = Debug|Win32
3227
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.Build.0 = Debug|Win32
33-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM.ActiveCfg = Release|ARM
34-
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM.Build.0 = Release|ARM
3528
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.ActiveCfg = Release|ARM64
3629
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.Build.0 = Release|ARM64
3730
{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x64.ActiveCfg = Release|x64

0 commit comments

Comments
 (0)