From b2c76d5634feb9b1541150e0ecdb65cd10037906 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 31 Aug 2023 14:25:30 -0700 Subject: [PATCH] AArch32 (ARM32) architecture deprecation (#387) --- .nuget/directxtex_uwp.nuspec | 6 -- CMakePresets.json | 11 --- DirectXTex/DirectXTex_Windows10_2019.vcxproj | 86 -------------------- DirectXTex/DirectXTex_Windows10_2022.vcxproj | 86 -------------------- DirectXTex_Windows10_2019.sln | 8 +- DirectXTex_Windows10_2022.sln | 9 +- build/DirectXTex-GitHub-CMake-Dev17.yml | 10 --- build/DirectXTex-GitHub-CMake.yml | 10 --- build/DirectXTex-GitHub-Dev17.yml | 16 ---- build/DirectXTex-GitHub.yml | 14 ---- 10 files changed, 2 insertions(+), 254 deletions(-) diff --git a/.nuget/directxtex_uwp.nuspec b/.nuget/directxtex_uwp.nuspec index 96cf684..bf753df 100644 --- a/.nuget/directxtex_uwp.nuspec +++ b/.nuget/directxtex_uwp.nuspec @@ -28,12 +28,6 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf - - - - - - diff --git a/CMakePresets.json b/CMakePresets.json index 699b351..1eaad50 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -29,15 +29,6 @@ "cacheVariables": { "DIRECTX_ARCH": "x86" }, "hidden": true }, - { - "name": "ARM", - "architecture": { - "value": "arm", - "strategy": "external" - }, - "cacheVariables": { "DIRECTX_ARCH": "arm" }, - "hidden": true - }, { "name": "ARM64", "architecture": { @@ -188,8 +179,6 @@ { "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" ] }, { "name": "x86-Release-UWP" , "description": "MSVC for x86 (Release) for UWP", "inherits": [ "base", "x86", "Release", "MSVC", "UWP" ] }, - { "name": "arm-Debug-UWP" , "description": "MSVC for ARM (Debug) for UWP", "inherits": [ "base", "ARM", "Debug", "MSVC", "UWP" ] }, - { "name": "arm-Release-UWP" , "description": "MSVC for ARM (Release) for UWP", "inherits": [ "base", "ARM", "Release", "MSVC", "UWP" ] }, { "name": "arm64-Debug-UWP" , "description": "MSVC for ARM64 (Debug) for UWP", "inherits": [ "base", "ARM64", "Debug", "MSVC", "UWP" ] }, { "name": "arm64-Release-UWP", "description": "MSVC for ARM64 (Release) for UWP", "inherits": [ "base", "ARM64", "Release", "MSVC", "UWP" ] }, diff --git a/DirectXTex/DirectXTex_Windows10_2019.vcxproj b/DirectXTex/DirectXTex_Windows10_2019.vcxproj index 8afb023..0978204 100644 --- a/DirectXTex/DirectXTex_Windows10_2019.vcxproj +++ b/DirectXTex/DirectXTex_Windows10_2019.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -57,9 +49,7 @@ Create Create - Create Create - Create Create Create Create @@ -108,11 +98,6 @@ true v142 - - StaticLibrary - true - v142 - StaticLibrary true @@ -128,11 +113,6 @@ false v142 - - StaticLibrary - false - v142 - StaticLibrary false @@ -154,15 +134,9 @@ - - - - - - @@ -186,24 +160,12 @@ DirectXTex false - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - Bin\Windows10_2019\$(Platform)\$(Configuration)\ Bin\Windows10_2019\$(Platform)\$(Configuration)\ DirectXTex false - - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - DirectXTex - false - Bin\Windows10_2019\$(Platform)\$(Configuration)\ Bin\Windows10_2019\$(Platform)\$(Configuration)\ @@ -272,31 +234,6 @@ false - - - Use - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - ProgramDatabase - false - Level4 - - - Console - false - false - - Use @@ -323,29 +260,6 @@ false - - - Use - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - true - Level4 - - - Console - false - false - - Use diff --git a/DirectXTex/DirectXTex_Windows10_2022.vcxproj b/DirectXTex/DirectXTex_Windows10_2022.vcxproj index 285d4b5..b4db4a0 100644 --- a/DirectXTex/DirectXTex_Windows10_2022.vcxproj +++ b/DirectXTex/DirectXTex_Windows10_2022.vcxproj @@ -1,10 +1,6 @@ - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -57,9 +49,7 @@ Create Create - Create Create - Create Create Create Create @@ -108,11 +98,6 @@ true v143 - - StaticLibrary - true - v143 - StaticLibrary true @@ -128,11 +113,6 @@ false v143 - - StaticLibrary - false - v143 - StaticLibrary false @@ -154,15 +134,9 @@ - - - - - - @@ -186,24 +160,12 @@ DirectXTex false - - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - DirectXTex - false - Bin\Windows10_2022\$(Platform)\$(Configuration)\ Bin\Windows10_2022\$(Platform)\$(Configuration)\ DirectXTex false - - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - DirectXTex - false - Bin\Windows10_2022\$(Platform)\$(Configuration)\ Bin\Windows10_2022\$(Platform)\$(Configuration)\ @@ -272,31 +234,6 @@ false - - - Use - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) - true - ProgramDatabase - false - Level4 - - - Console - false - false - - Use @@ -323,29 +260,6 @@ false - - - Use - - false - true - Fast - $(IntDir)$(TargetName).pdb - EnableAllWarnings - DirectXTexP.h - $(ProjectDir);$(ProjectDir)Shaders\Compiled;%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:twoPhase- /Zc:__cplusplus %(AdditionalOptions) - true - Level4 - - - Console - false - false - - Use diff --git a/DirectXTex_Windows10_2019.sln b/DirectXTex_Windows10_2019.sln index 25f7500..62ac35f 100644 --- a/DirectXTex_Windows10_2019.sln +++ b/DirectXTex_Windows10_2019.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 15.0.27130.2020 +VisualStudioVersion = 16.0.33927.289 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_Windows10_2019.vcxproj", "{FB3F52B5-BFE8-43FD-836F-363735DAB738}" EndProject @@ -12,26 +12,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM.ActiveCfg = Debug|ARM - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM.Build.0 = Debug|ARM {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.ActiveCfg = Debug|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.Build.0 = Debug|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.ActiveCfg = Debug|x64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.Build.0 = Debug|x64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.ActiveCfg = Debug|Win32 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.Build.0 = Debug|Win32 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM.ActiveCfg = Release|ARM - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM.Build.0 = Release|ARM {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.ActiveCfg = Release|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.Build.0 = Release|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x64.ActiveCfg = Release|x64 diff --git a/DirectXTex_Windows10_2022.sln b/DirectXTex_Windows10_2022.sln index 887fc1b..b21950c 100644 --- a/DirectXTex_Windows10_2022.sln +++ b/DirectXTex_Windows10_2022.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 15.0.27130.2020 +VisualStudioVersion = 17.7.34009.444 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_Windows10_2022.vcxproj", "{FB3F52B5-BFE8-43FD-836F-363735DAB738}" EndProject @@ -12,26 +11,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM.ActiveCfg = Debug|ARM - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM.Build.0 = Debug|ARM {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.ActiveCfg = Debug|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.Build.0 = Debug|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.ActiveCfg = Debug|x64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.Build.0 = Debug|x64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.ActiveCfg = Debug|Win32 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.Build.0 = Debug|Win32 - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM.ActiveCfg = Release|ARM - {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM.Build.0 = Release|ARM {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.ActiveCfg = Release|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.Build.0 = Release|ARM64 {FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x64.ActiveCfg = Release|x64 diff --git a/build/DirectXTex-GitHub-CMake-Dev17.yml b/build/DirectXTex-GitHub-CMake-Dev17.yml index c9c2135..ed1bda0 100644 --- a/build/DirectXTex-GitHub-CMake-Dev17.yml +++ b/build/DirectXTex-GitHub-CMake-Dev17.yml @@ -93,16 +93,6 @@ jobs: inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --build out4 -v - - task: CMake@1 - displayName: 'CMake (UWP): Config ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM -B out5 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0' - - task: CMake@1 - displayName: 'CMake (UWP): Build ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v - task: CMake@1 displayName: 'CMake (ClangCl): Config x64' inputs: diff --git a/build/DirectXTex-GitHub-CMake.yml b/build/DirectXTex-GitHub-CMake.yml index 77d37e6..35a39e2 100644 --- a/build/DirectXTex-GitHub-CMake.yml +++ b/build/DirectXTex-GitHub-CMake.yml @@ -105,16 +105,6 @@ jobs: inputs: cwd: '$(Build.SourcesDirectory)' cmakeArgs: --build out4 -v - - task: CMake@1 - displayName: 'CMake (UWP): Config ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: '-G "$(VS_GENERATOR)" -A ARM -B out5 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0' - - task: CMake@1 - displayName: 'CMake (UWP): Build ARM' - inputs: - cwd: '$(Build.SourcesDirectory)' - cmakeArgs: --build out5 -v - task: CMake@1 displayName: 'CMake (ClangCl): Config x64' inputs: diff --git a/build/DirectXTex-GitHub-Dev17.yml b/build/DirectXTex-GitHub-Dev17.yml index ee97049..e5e5ab5 100644 --- a/build/DirectXTex-GitHub-Dev17.yml +++ b/build/DirectXTex-GitHub-Dev17.yml @@ -245,22 +245,6 @@ jobs: platform: x64 configuration: Release msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2022.sln armdbg - inputs: - solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2022.sln armrel - inputs: - solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - msbuildArchitecture: x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg inputs: diff --git a/build/DirectXTex-GitHub.yml b/build/DirectXTex-GitHub.yml index c917ca1..6f57d23 100644 --- a/build/DirectXTex-GitHub.yml +++ b/build/DirectXTex-GitHub.yml @@ -243,20 +243,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln armdbg - inputs: - solution: DirectXTex_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution DirectXTex_Windows10_2019.sln armrel - inputs: - solution: DirectXTex_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2019.sln arm64dbg inputs: