Rename solution platform name Win32 to x86 and clean up .vcxproj file

WinMerge · Dec 12, 2021 · ce5465c · ce5465c
1 parent 1b61282
commit ce5465c
Show file tree

Hide file tree

Showing 74 changed files with 1,450 additions and 2,077 deletions.
diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
diff --git a/ArchiveSupport/Merge7z/BuildArc.cmd b/ArchiveSupport/Merge7z/BuildArc.cmd
@@ -1,13 +1,14 @@
 pushd "%~dp0"
 
 setlocal
-set MERGE7z_VERSION=2106.0
+set MERGE7z_VERSION=2106.1
 set PATH="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%PATH%
 set DISTDIR=..\..\Build\Releases
 
 if "%1" == "" (
-  call :BuildZip 
+  call :BuildZip x86
   call :BuildZip x64
+  call :BuildZip ARM
   call :BuildZip ARM64
 ) else (
   call :BuildZip %1 
@@ -21,25 +22,26 @@ goto :eof
 
 set PLATFORM=%1
 
-mkdir ..\..\Build\%PLATFORM%\Merge7z\Lang 2> NUL
-copy ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll ..\..\Build\%PLATFORM%\Merge7z\
-if "%PLATFORM%" == "" (
+mkdir %DISTDIR%\%PLATFORM%\Merge7z\Lang 2> NUL
+copy ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll %DISTDIR%\%PLATFORM%\Merge7z\
+if "%PLATFORM%" == "x86" (
   set "ProgramFilesP=%ProgramFiles(x86)%"
-  set ZIP_FILENAME=Merge7z%MERGE7Z_VERSION%-win32.zip
 ) else (
   set ProgramFilesP=%ProgramFiles%
-  set ZIP_FILENAME=Merge7z%MERGE7Z_VERSION%-%PLATFORM%.zip
 )
+set ZIP_FILENAME=Merge7z%MERGE7Z_VERSION%-%PLATFORM%.zip
 
 if "%PLATFORM%" == "ARM64" (
-  copy /y "..\..\Externals\sevenzip\CPP\7zip\Bundles\Format7zF\arm64\7z.dll" ..\..\Build\%PLATFORM%\Merge7z\
+  copy /y "..\..\Externals\sevenzip\CPP\7zip\Bundles\Format7zF\arm64\7z.dll" %DISTDIR%\%PLATFORM%\Merge7z\
+) else if "%PLATFORM%" == "ARM" (
+  copy /y "..\..\Externals\sevenzip\CPP\7zip\Bundles\Format7zF\arm\7z.dll" %DISTDIR%\%PLATFORM%\Merge7z\
 ) else (
-  copy /y "%ProgramFilesP%\7-Zip\7z.dll" ..\..\Build\%PLATFORM%\Merge7z\
+  copy /y "%ProgramFilesP%\7-Zip\7z.dll" %DISTDIR%\%PLATFORM%\Merge7z\
 )
-copy /y "%ProgramFilesP%\7-Zip\History.txt" ..\..\Build\%PLATFORM%\Merge7z\
-copy /y "%ProgramFilesP%\7-Zip\License.txt" ..\..\Build\%PLATFORM%\Merge7z\
-copy /y "%ProgramFilesP%\7-Zip\Lang\*.*" ..\..\Build\%PLATFORM%\Merge7z\Lang\
+copy /y "%ProgramFilesP%\7-Zip\History.txt" %DISTDIR%\%PLATFORM%\Merge7z\
+copy /y "%ProgramFilesP%\7-Zip\License.txt" %DISTDIR%\%PLATFORM%\Merge7z\
+copy /y "%ProgramFilesP%\7-Zip\Lang\*.*" %DISTDIR%\%PLATFORM%\Merge7z\Lang\
 
-7z.exe a -tzip "%DISTDIR%\%ZIP_FILENAME%" ..\..\Build\%PLATFORM%\Merge7z
+7z.exe a -tzip "%DISTDIR%\%ZIP_FILENAME%" %DISTDIR%\%PLATFORM%\Merge7z
 
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2017.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2017.cmd
@@ -9,8 +9,9 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
 )
 
 if "%1" == "" (
-  call :BuildBin
+  call :BuildBin x86
   call :BuildBin x64
+  call :BuildBin ARM
   call :BuildBin ARM64
 ) else (
   call :BuildBin %1 
@@ -19,19 +20,13 @@ if "%1" == "" (
 goto :eof
 
 :BuildBin
-set PLATFORM=%1
-if "%1" == "" (
-  set PLATFORM_VS=Win32
-) else (
-  set PLATFORM_VS=%1
-)
-MSBuild Merge7z.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
+MSBuild Merge7z.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%1" || pause
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
+  call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
 )
 
-mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
+copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2019.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2019.cmd
@@ -9,8 +9,9 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
 )
 
 if "%1" == "" (
-  call :BuildBin
+  call :BuildBin x86
   call :BuildBin x64
+  call :BuildBin ARM
   call :BuildBin ARM64
 ) else (
   call :BuildBin %1 
@@ -19,19 +20,13 @@ if "%1" == "" (
 goto :eof
 
 :BuildBin
-set PLATFORM=%1
-if "%1" == "" (
-  set PLATFORM_VS=Win32
-) else (
-  set PLATFORM_VS=%1
-)
-MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
+MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%1" || pause
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
+  call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
 )
 
-mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
+copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/BuildBin.vs2022.cmd b/ArchiveSupport/Merge7z/BuildBin.vs2022.cmd
@@ -9,8 +9,9 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
 )
 
 if "%1" == "" (
-  call :BuildBin
+  call :BuildBin x86
   call :BuildBin x64
+  call :BuildBin ARM
   call :BuildBin ARM64
 ) else (
   call :BuildBin %1 
@@ -19,19 +20,13 @@ if "%1" == "" (
 goto :eof
 
 :BuildBin
-set PLATFORM=%1
-if "%1" == "" (
-  set PLATFORM_VS=Win32
-) else (
-  set PLATFORM_VS=%1
-)
-MSBuild Merge7z.vs2022.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
+MSBuild Merge7z.vs2022.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%1" || pause
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
+  call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
 )
 
-mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
+copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
 goto :eof
diff --git a/ArchiveSupport/Merge7z/Merge7z.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vcxproj
@@ -144,26 +144,26 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\Build\$(Configuration)\Merge7z\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\Build\$(Configuration)\Merge7z\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.sln b/ArchiveSupport/Merge7z/Merge7z.vs2017.sln
@@ -8,30 +8,30 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.ActiveCfg = Debug|Win32
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2019.sln b/ArchiveSupport/Merge7z/Merge7z.vs2019.sln
@@ -8,30 +8,30 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.ActiveCfg = Debug|Win32
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2022.sln b/ArchiveSupport/Merge7z/Merge7z.vs2022.sln
@@ -9,30 +9,30 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
 		Debug|ARM64 = Debug|ARM64
-		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|ARM = Release|ARM
 		Release|ARM64 = Release|ARM64
-		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.ActiveCfg = Debug|Win32
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.Build.0 = Debug|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32
-		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64
 		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
+		{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/BuildAll.vs2022x64_vs2017Win32.cmd b/BuildAll.vs2022x64_vs2017Win32.cmd
@@ -1,7 +1,10 @@
 pushd "%~dp0"
 call BuildManual.cmd || goto :eof
 setlocal
-call BuildBin.vs2017.cmd Win32 || goto :eof
+call BuildBin.vs2017.cmd x86 || goto :eof
+endlocal
+setlocal
+call BuildBin.vs2022.cmd ARM || goto :eof
 endlocal
 setlocal
 call BuildBin.vs2022.cmd ARM64 || goto :eof