From 74b92c4f4143a20d80e2fffcc9170a93b8ffc352 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 31 Aug 2023 14:25:15 -0700 Subject: [PATCH] AArch32 (ARM32) architecture deprecation (#123) --- CMakePresets.json | 11 ---- UVAtlas/UVAtlas_Windows10_2019.vcxproj | 82 ------------------------- UVAtlas/UVAtlas_Windows10_2022.vcxproj | 82 ------------------------- UVAtlas_Windows10_2019.sln | 8 +-- UVAtlas_Windows10_2022.sln | 9 +-- build/Directory.Build.props | 3 - build/UVAtlas-GitHub-CMake-Dev17.yml | 10 --- build/UVAtlas-GitHub-CMake.yml | 10 --- build/UVAtlas-GitHub-Dev17.yml | 16 ----- build/UVAtlas-GitHub-SDK-prerelease.yml | 19 ------ build/UVAtlas-GitHub-SDK-release.yml | 19 ------ build/UVAtlas-GitHub.yml | 14 ----- 12 files changed, 2 insertions(+), 281 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index d788579..56fb0a2 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": { @@ -173,8 +164,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/UVAtlas/UVAtlas_Windows10_2019.vcxproj b/UVAtlas/UVAtlas_Windows10_2019.vcxproj index 5965f91..d0111cc 100644 --- a/UVAtlas/UVAtlas_Windows10_2019.vcxproj +++ b/UVAtlas/UVAtlas_Windows10_2019.vcxproj @@ -1,10 +1,6 @@  - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -58,9 +50,7 @@ Create Create - Create Create - Create Create Create Create @@ -116,11 +106,6 @@ true v142 - - StaticLibrary - true - v142 - StaticLibrary true @@ -136,11 +121,6 @@ false v142 - - StaticLibrary - false - v142 - StaticLibrary false @@ -162,15 +142,9 @@ - - - - - - @@ -194,24 +168,12 @@ Bin\Windows10_2019\$(Platform)\$(Configuration)\ UVAtlas - - false - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - UVAtlas - false Bin\Windows10_2019\$(Platform)\$(Configuration)\ Bin\Windows10_2019\$(Platform)\$(Configuration)\ UVAtlas - - false - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - Bin\Windows10_2019\$(Platform)\$(Configuration)\ - UVAtlas - false Bin\Windows10_2019\$(Platform)\$(Configuration)\ @@ -276,29 +238,6 @@ false - - - Use - - false - true - EnableAllWarnings - Fast - $(IntDir)$(TargetName).pdb - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Console - false - false - - Use @@ -323,27 +262,6 @@ false - - - Use - - false - true - EnableAllWarnings - Fast - $(IntDir)$(TargetName).pdb - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus /ZH:SHA_256 %(AdditionalOptions) - Level4 - - - Console - false - false - - Use diff --git a/UVAtlas/UVAtlas_Windows10_2022.vcxproj b/UVAtlas/UVAtlas_Windows10_2022.vcxproj index 229555f..a3762cb 100644 --- a/UVAtlas/UVAtlas_Windows10_2022.vcxproj +++ b/UVAtlas/UVAtlas_Windows10_2022.vcxproj @@ -1,10 +1,6 @@ - - Debug - ARM - Debug ARM64 @@ -17,10 +13,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -58,9 +50,7 @@ Create Create - Create Create - Create Create Create Create @@ -116,11 +106,6 @@ true v143 - - StaticLibrary - true - v143 - StaticLibrary true @@ -136,11 +121,6 @@ false v143 - - StaticLibrary - false - v143 - StaticLibrary false @@ -162,15 +142,9 @@ - - - - - - @@ -194,24 +168,12 @@ Bin\Windows10_2022\$(Platform)\$(Configuration)\ UVAtlas - - false - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - UVAtlas - false Bin\Windows10_2022\$(Platform)\$(Configuration)\ Bin\Windows10_2022\$(Platform)\$(Configuration)\ UVAtlas - - false - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - Bin\Windows10_2022\$(Platform)\$(Configuration)\ - UVAtlas - false Bin\Windows10_2022\$(Platform)\$(Configuration)\ @@ -276,29 +238,6 @@ false - - - Use - - false - true - EnableAllWarnings - Fast - $(IntDir)$(TargetName).pdb - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus %(AdditionalOptions) - ProgramDatabase - false - Level4 - - - Console - false - false - - Use @@ -323,27 +262,6 @@ false - - - Use - - false - true - EnableAllWarnings - Fast - $(IntDir)$(TargetName).pdb - $(ProjectDir);$(ProjectDir)Inc;$(ProjectDir)geodesics;$(ProjectDir)isochart;$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions) - true - /Zc:__cplusplus %(AdditionalOptions) - Level4 - - - Console - false - false - - Use diff --git a/UVAtlas_Windows10_2019.sln b/UVAtlas_Windows10_2019.sln index f280eb1..8c4647e 100644 --- a/UVAtlas_Windows10_2019.sln +++ b/UVAtlas_Windows10_2019.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29009.5 +VisualStudioVersion = 16.0.33927.289 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas\UVAtlas_Windows10_2019.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}" 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 - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM.ActiveCfg = Debug|ARM - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM.Build.0 = Debug|ARM {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM64.Build.0 = Debug|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x64.ActiveCfg = Debug|x64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x64.Build.0 = Debug|x64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x86.ActiveCfg = Debug|Win32 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x86.Build.0 = Debug|Win32 - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM.ActiveCfg = Release|ARM - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM.Build.0 = Release|ARM {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM64.ActiveCfg = Release|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM64.Build.0 = Release|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|x64.ActiveCfg = Release|x64 diff --git a/UVAtlas_Windows10_2022.sln b/UVAtlas_Windows10_2022.sln index 6b54f00..a161d07 100644 --- a/UVAtlas_Windows10_2022.sln +++ b/UVAtlas_Windows10_2022.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 16.0.29009.5 +VisualStudioVersion = 17.7.34009.444 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UVAtlas", "UVAtlas\UVAtlas_Windows10_2022.vcxproj", "{2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}" 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 - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM.ActiveCfg = Debug|ARM - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM.Build.0 = Debug|ARM {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|ARM64.Build.0 = Debug|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x64.ActiveCfg = Debug|x64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x64.Build.0 = Debug|x64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x86.ActiveCfg = Debug|Win32 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Debug|x86.Build.0 = Debug|Win32 - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM.ActiveCfg = Release|ARM - {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM.Build.0 = Release|ARM {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM64.ActiveCfg = Release|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|ARM64.Build.0 = Release|ARM64 {2554D4E8-57F0-46F7-8B8F-3727D65BDE5E}.Release|x64.ActiveCfg = Release|x64 diff --git a/build/Directory.Build.props b/build/Directory.Build.props index 9c0a981..895e6d8 100644 --- a/build/Directory.Build.props +++ b/build/Directory.Build.props @@ -15,9 +15,6 @@ - - diff --git a/build/UVAtlas-GitHub-CMake-Dev17.yml b/build/UVAtlas-GitHub-CMake-Dev17.yml index 15403d9..3b5fb26 100644 --- a/build/UVAtlas-GitHub-CMake-Dev17.yml +++ b/build/UVAtlas-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/UVAtlas-GitHub-CMake.yml b/build/UVAtlas-GitHub-CMake.yml index c61def0..f1185de 100644 --- a/build/UVAtlas-GitHub-CMake.yml +++ b/build/UVAtlas-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/UVAtlas-GitHub-Dev17.yml b/build/UVAtlas-GitHub-Dev17.yml index 6a2b452..99f365b 100644 --- a/build/UVAtlas-GitHub-Dev17.yml +++ b/build/UVAtlas-GitHub-Dev17.yml @@ -200,22 +200,6 @@ jobs: platform: x64 configuration: Release msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2022.sln armdbg - inputs: - solution: UVAtlas_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - msbuildArchitecture: x64 - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2022.sln armrel - inputs: - solution: UVAtlas_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - msbuildArchitecture: x64 - task: VSBuild@1 displayName: Build solution UVAtlas_Windows10_2022.sln arm64dbg inputs: diff --git a/build/UVAtlas-GitHub-SDK-prerelease.yml b/build/UVAtlas-GitHub-SDK-prerelease.yml index 5e2fdbf..885011b 100644 --- a/build/UVAtlas-GitHub-SDK-prerelease.yml +++ b/build/UVAtlas-GitHub-SDK-prerelease.yml @@ -170,11 +170,6 @@ jobs: inputs: command: custom arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK - - task: NuGetCommand@2 - displayName: NuGet Install WSDK arm - inputs: - command: custom - arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK - task: NuGetCommand@2 displayName: NuGet Install WSDK arm64 inputs: @@ -214,20 +209,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2019.sln armdbg - inputs: - solution: UVAtlas_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2019.sln armrel - inputs: - solution: UVAtlas_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution UVAtlas_Windows10_2019.sln arm64dbg inputs: diff --git a/build/UVAtlas-GitHub-SDK-release.yml b/build/UVAtlas-GitHub-SDK-release.yml index a2aee0c..b8514f0 100644 --- a/build/UVAtlas-GitHub-SDK-release.yml +++ b/build/UVAtlas-GitHub-SDK-release.yml @@ -170,11 +170,6 @@ jobs: inputs: command: custom arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK - - task: NuGetCommand@2 - displayName: NuGet Install WSDK arm - inputs: - command: custom - arguments: install Microsoft.Windows.SDK.CPP.arm -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK - task: NuGetCommand@2 displayName: NuGet Install WSDK arm64 inputs: @@ -214,20 +209,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2019.sln armdbg - inputs: - solution: UVAtlas_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2019.sln armrel - inputs: - solution: UVAtlas_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution UVAtlas_Windows10_2019.sln arm64dbg inputs: diff --git a/build/UVAtlas-GitHub.yml b/build/UVAtlas-GitHub.yml index 2bc9154..f3bf4f9 100644 --- a/build/UVAtlas-GitHub.yml +++ b/build/UVAtlas-GitHub.yml @@ -204,20 +204,6 @@ jobs: msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2019.sln armdbg - inputs: - solution: UVAtlas_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Debug - - task: VSBuild@1 - displayName: Build solution UVAtlas_Windows10_2019.sln armrel - inputs: - solution: UVAtlas_Windows10_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 - platform: ARM - configuration: Release - task: VSBuild@1 displayName: Build solution UVAtlas_Windows10_2019.sln arm64dbg inputs: