Skip to content

Commit ce5465c

Browse files
committed
Rename solution platform name Win32 to x86 and clean up .vcxproj file
1 parent 1b61282 commit ce5465c

File tree

74 files changed

+1450
-2077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1450
-2077
lines changed

ALL.vs2017.sln

+217-217
Large diffs are not rendered by default.

ALL.vs2019.sln

+217-217
Large diffs are not rendered by default.

ALL.vs2022.sln

+217-217
Large diffs are not rendered by default.

ArchiveSupport/Merge7z/BuildArc.cmd

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
pushd "%~dp0"
22

33
setlocal
4-
set MERGE7z_VERSION=2106.0
4+
set MERGE7z_VERSION=2106.1
55
set PATH="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%PATH%
66
set DISTDIR=..\..\Build\Releases
77

88
if "%1" == "" (
9-
call :BuildZip
9+
call :BuildZip x86
1010
call :BuildZip x64
11+
call :BuildZip ARM
1112
call :BuildZip ARM64
1213
) else (
1314
call :BuildZip %1
@@ -21,25 +22,26 @@ goto :eof
2122

2223
set PLATFORM=%1
2324

24-
mkdir ..\..\Build\%PLATFORM%\Merge7z\Lang 2> NUL
25-
copy ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll ..\..\Build\%PLATFORM%\Merge7z\
26-
if "%PLATFORM%" == "" (
25+
mkdir %DISTDIR%\%PLATFORM%\Merge7z\Lang 2> NUL
26+
copy ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll %DISTDIR%\%PLATFORM%\Merge7z\
27+
if "%PLATFORM%" == "x86" (
2728
set "ProgramFilesP=%ProgramFiles(x86)%"
28-
set ZIP_FILENAME=Merge7z%MERGE7Z_VERSION%-win32.zip
2929
) else (
3030
set ProgramFilesP=%ProgramFiles%
31-
set ZIP_FILENAME=Merge7z%MERGE7Z_VERSION%-%PLATFORM%.zip
3231
)
32+
set ZIP_FILENAME=Merge7z%MERGE7Z_VERSION%-%PLATFORM%.zip
3333

3434
if "%PLATFORM%" == "ARM64" (
35-
copy /y "..\..\Externals\sevenzip\CPP\7zip\Bundles\Format7zF\arm64\7z.dll" ..\..\Build\%PLATFORM%\Merge7z\
35+
copy /y "..\..\Externals\sevenzip\CPP\7zip\Bundles\Format7zF\arm64\7z.dll" %DISTDIR%\%PLATFORM%\Merge7z\
36+
) else if "%PLATFORM%" == "ARM" (
37+
copy /y "..\..\Externals\sevenzip\CPP\7zip\Bundles\Format7zF\arm\7z.dll" %DISTDIR%\%PLATFORM%\Merge7z\
3638
) else (
37-
copy /y "%ProgramFilesP%\7-Zip\7z.dll" ..\..\Build\%PLATFORM%\Merge7z\
39+
copy /y "%ProgramFilesP%\7-Zip\7z.dll" %DISTDIR%\%PLATFORM%\Merge7z\
3840
)
39-
copy /y "%ProgramFilesP%\7-Zip\History.txt" ..\..\Build\%PLATFORM%\Merge7z\
40-
copy /y "%ProgramFilesP%\7-Zip\License.txt" ..\..\Build\%PLATFORM%\Merge7z\
41-
copy /y "%ProgramFilesP%\7-Zip\Lang\*.*" ..\..\Build\%PLATFORM%\Merge7z\Lang\
41+
copy /y "%ProgramFilesP%\7-Zip\History.txt" %DISTDIR%\%PLATFORM%\Merge7z\
42+
copy /y "%ProgramFilesP%\7-Zip\License.txt" %DISTDIR%\%PLATFORM%\Merge7z\
43+
copy /y "%ProgramFilesP%\7-Zip\Lang\*.*" %DISTDIR%\%PLATFORM%\Merge7z\Lang\
4244

43-
7z.exe a -tzip "%DISTDIR%\%ZIP_FILENAME%" ..\..\Build\%PLATFORM%\Merge7z
45+
7z.exe a -tzip "%DISTDIR%\%ZIP_FILENAME%" %DISTDIR%\%PLATFORM%\Merge7z
4446

4547
goto :eof

ArchiveSupport/Merge7z/BuildBin.vs2017.cmd

+6-11
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
99
)
1010

1111
if "%1" == "" (
12-
call :BuildBin
12+
call :BuildBin x86
1313
call :BuildBin x64
14+
call :BuildBin ARM
1415
call :BuildBin ARM64
1516
) else (
1617
call :BuildBin %1
@@ -19,19 +20,13 @@ if "%1" == "" (
1920
goto :eof
2021

2122
:BuildBin
22-
set PLATFORM=%1
23-
if "%1" == "" (
24-
set PLATFORM_VS=Win32
25-
) else (
26-
set PLATFORM_VS=%1
27-
)
28-
MSBuild Merge7z.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
23+
MSBuild Merge7z.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%1" || pause
2924
endlocal
3025

3126
if exist "%SIGNBAT_PATH%" (
32-
call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
27+
call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
3328
)
3429

35-
mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
36-
copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
30+
mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
31+
copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
3732
goto :eof

ArchiveSupport/Merge7z/BuildBin.vs2019.cmd

+6-11
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
99
)
1010

1111
if "%1" == "" (
12-
call :BuildBin
12+
call :BuildBin x86
1313
call :BuildBin x64
14+
call :BuildBin ARM
1415
call :BuildBin ARM64
1516
) else (
1617
call :BuildBin %1
@@ -19,19 +20,13 @@ if "%1" == "" (
1920
goto :eof
2021

2122
:BuildBin
22-
set PLATFORM=%1
23-
if "%1" == "" (
24-
set PLATFORM_VS=Win32
25-
) else (
26-
set PLATFORM_VS=%1
27-
)
28-
MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
23+
MSBuild Merge7z.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%1" || pause
2924
endlocal
3025

3126
if exist "%SIGNBAT_PATH%" (
32-
call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
27+
call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
3328
)
3429

35-
mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
36-
copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
30+
mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
31+
copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
3732
goto :eof

ArchiveSupport/Merge7z/BuildBin.vs2022.cmd

+6-11
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
99
)
1010

1111
if "%1" == "" (
12-
call :BuildBin
12+
call :BuildBin x86
1313
call :BuildBin x64
14+
call :BuildBin ARM
1415
call :BuildBin ARM64
1516
) else (
1617
call :BuildBin %1
@@ -19,19 +20,13 @@ if "%1" == "" (
1920
goto :eof
2021

2122
:BuildBin
22-
set PLATFORM=%1
23-
if "%1" == "" (
24-
set PLATFORM_VS=Win32
25-
) else (
26-
set PLATFORM_VS=%1
27-
)
28-
MSBuild Merge7z.vs2022.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || pause
23+
MSBuild Merge7z.vs2022.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%1" || pause
2924
endlocal
3025

3126
if exist "%SIGNBAT_PATH%" (
32-
call "%SIGNBAT_PATH%" ..\..\Build\%PLATFORM%\Release\Merge7z\Merge7z.dll
27+
call "%SIGNBAT_PATH%" ..\..\Build\%1\Release\Merge7z\Merge7z.dll
3328
)
3429

35-
mkdir ..\..\Build\%PLATFORM%\Release\%APPVER% 2> NUL
36-
copy ..\..\Build\%PlATFORM%\Release\Merge7z\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
30+
mkdir ..\..\Build\%1\Release\%APPVER% 2> NUL
31+
copy ..\..\Build\%1\Release\Merge7z\*.pdb "Build\%1\Release\%APPVER%\"
3732
goto :eof

ArchiveSupport/Merge7z/Merge7z.vcxproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -144,26 +144,26 @@
144144
<PropertyGroup Label="UserMacros" />
145145
<PropertyGroup>
146146
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
147-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\Build\$(Configuration)\Merge7z\</OutDir>
148-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
149-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
150-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
151-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
152-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
153-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
154-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
147+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
148+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
149+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
150+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
151+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
152+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
153+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
154+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
155155
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
156156
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
157157
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</LinkIncremental>
158158
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</LinkIncremental>
159-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\Build\$(Configuration)\Merge7z\</OutDir>
160-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
161-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
162-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\Build\$(Platform)\$(Configuration)\Merge7z\</OutDir>
163-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
164-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
165-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
166-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\BuildTmp\$(ProjectName)\$(Platform)\$(Configuration)/</IntDir>
159+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
160+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
161+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
162+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\Build\$(PlatformTarget)\$(Configuration)\$(ProjectName)\</OutDir>
163+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
164+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
165+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
166+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">..\..\BuildTmp\$(ProjectName)\$(PlatformTarget)\$(Configuration)/</IntDir>
167167
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
168168
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
169169
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>

ArchiveSupport/Merge7z/Merge7z.vs2017.sln

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|ARM = Debug|ARM
1010
Debug|ARM64 = Debug|ARM64
11-
Debug|Win32 = Debug|Win32
1211
Debug|x64 = Debug|x64
12+
Debug|x86 = Debug|x86
1313
Release|ARM = Release|ARM
1414
Release|ARM64 = Release|ARM64
15-
Release|Win32 = Release|Win32
1615
Release|x64 = Release|x64
16+
Release|x86 = Release|x86
1717
EndGlobalSection
1818
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1919
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
2020
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
2121
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
2222
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
23-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
24-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
2523
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
2624
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
25+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.ActiveCfg = Debug|Win32
26+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.Build.0 = Debug|Win32
2727
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
2828
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
2929
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
3030
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
31-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32
32-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32
3331
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64
3432
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64
33+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
34+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
3535
EndGlobalSection
3636
GlobalSection(SolutionProperties) = preSolution
3737
HideSolutionNode = FALSE

ArchiveSupport/Merge7z/Merge7z.vs2019.sln

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99
Debug|ARM = Debug|ARM
1010
Debug|ARM64 = Debug|ARM64
11-
Debug|Win32 = Debug|Win32
1211
Debug|x64 = Debug|x64
12+
Debug|x86 = Debug|x86
1313
Release|ARM = Release|ARM
1414
Release|ARM64 = Release|ARM64
15-
Release|Win32 = Release|Win32
1615
Release|x64 = Release|x64
16+
Release|x86 = Release|x86
1717
EndGlobalSection
1818
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1919
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
2020
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
2121
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
2222
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
23-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
24-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
2523
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
2624
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
25+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.ActiveCfg = Debug|Win32
26+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.Build.0 = Debug|Win32
2727
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
2828
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
2929
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
3030
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
31-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32
32-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32
3331
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64
3432
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64
33+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
34+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
3535
EndGlobalSection
3636
GlobalSection(SolutionProperties) = preSolution
3737
HideSolutionNode = FALSE

ArchiveSupport/Merge7z/Merge7z.vs2022.sln

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|ARM = Debug|ARM
1111
Debug|ARM64 = Debug|ARM64
12-
Debug|Win32 = Debug|Win32
1312
Debug|x64 = Debug|x64
13+
Debug|x86 = Debug|x86
1414
Release|ARM = Release|ARM
1515
Release|ARM64 = Release|ARM64
16-
Release|Win32 = Release|Win32
1716
Release|x64 = Release|x64
17+
Release|x86 = Release|x86
1818
EndGlobalSection
1919
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2020
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.ActiveCfg = Debug|ARM
2121
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM.Build.0 = Debug|ARM
2222
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.ActiveCfg = Debug|ARM64
2323
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|ARM64.Build.0 = Debug|ARM64
24-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.ActiveCfg = Debug|Win32
25-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|Win32.Build.0 = Debug|Win32
2624
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.ActiveCfg = Debug|x64
2725
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x64.Build.0 = Debug|x64
26+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.ActiveCfg = Debug|Win32
27+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Debug|x86.Build.0 = Debug|Win32
2828
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.ActiveCfg = Release|ARM
2929
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM.Build.0 = Release|ARM
3030
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.ActiveCfg = Release|ARM64
3131
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|ARM64.Build.0 = Release|ARM64
32-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.ActiveCfg = Release|Win32
33-
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|Win32.Build.0 = Release|Win32
3432
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.ActiveCfg = Release|x64
3533
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x64.Build.0 = Release|x64
34+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
35+
{FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
3636
EndGlobalSection
3737
GlobalSection(SolutionProperties) = preSolution
3838
HideSolutionNode = FALSE

BuildAll.vs2022x64_vs2017Win32.cmd

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
pushd "%~dp0"
22
call BuildManual.cmd || goto :eof
33
setlocal
4-
call BuildBin.vs2017.cmd Win32 || goto :eof
4+
call BuildBin.vs2017.cmd x86 || goto :eof
5+
endlocal
6+
setlocal
7+
call BuildBin.vs2022.cmd ARM || goto :eof
58
endlocal
69
setlocal
710
call BuildBin.vs2022.cmd ARM64 || goto :eof

0 commit comments

Comments
 (0)