From 5245d379dba512369e54a14118277ae047c2c029 Mon Sep 17 00:00:00 2001
From: Tino Reichardt <milky-7zip@mcmilk.de>
Date: Sat, 11 Apr 2020 12:11:33 +0200
Subject: [PATCH] Compiling: Switch to Visual Studio 2017

---
 C/7zVersion.h     |   2 +-
 CPP/appveyor.cmd  |  79 +++++++++--------------------------
 CPP/build-arm.cmd | 101 --------------------------------------------
 CPP/build-it.cmd  | 103 +++++++++++++++++++++++++++++++++++++++++++++
 CPP/build-x32.cmd | 104 ----------------------------------------------
 CPP/build-x64.cmd | 103 ---------------------------------------------
 cleanup.cmd       |  12 ------
 7 files changed, 124 insertions(+), 380 deletions(-)
 delete mode 100644 CPP/build-arm.cmd
 create mode 100644 CPP/build-it.cmd
 delete mode 100644 CPP/build-x32.cmd
 delete mode 100644 CPP/build-x64.cmd
 delete mode 100644 cleanup.cmd

diff --git a/C/7zVersion.h b/C/7zVersion.h
index 5c4b1055..f934b2f2 100644
--- a/C/7zVersion.h
+++ b/C/7zVersion.h
@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2020-04-10"
+#define MY_DATE "2020-04-11"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"
diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd
index 5e34e1cb..842d3299 100644
--- a/CPP/appveyor.cmd
+++ b/CPP/appveyor.cmd
@@ -1,83 +1,44 @@
 @echo off
 
 REM Microsoft Windows SDK 7.1    (VC=sdk71) -> can compile for IA64, but who needs that?
-REM Microsoft Visual Studio 2010 (VC=10.0) -> for win2k
+REM Microsoft Visual Studio 2010 (VC=10.0) -> for win2k, but who needs that?
 REM Microsoft Visual Studio 2012 (VC=11.0)
 REM Microsoft Visual Studio 2013 (VC=12.0)
 REM Microsoft Visual Studio 2015 (VC=14.0)
-REM Microsoft Visual Studio 2017 (VC=15.0)  -> for: x32 + x64
+REM Microsoft Visual Studio 2017 (VC=15.0)
 
 REM to many vcvarsall.cmd calls will blow it up!
 set OPATH=%PATH%
 set ERRFILE=%APPVEYOR_BUILD_FOLDER%\error.txt
 cd %APPVEYOR_BUILD_FOLDER%\CPP
 
-REM releases now:
-REM sdk71: ia builds
-REM vc10: win2k builds
-REM vc14: >= winxp builds
-REM /TR 2019-09-07
-goto vc14
+goto build_vs2017
 
-:sdk71
-set VC=sdk71
-set NEXT=vc10
-goto build_sdk
-
-:vc10
-set VC=10.0
-set NEXT=vc14
-set CFLAGS=
-goto build_vc
-
-:vc11
-set VC=11.0
-set NEXT=end
-set CFLAGS=-Gw
-goto build_vc
-
-:vc12
-set VC=12.0
-set NEXT=end
-set CFLAGS=-Gw
-goto build_vc
-
-:vc14
-set VC=14.0
-set NEXT=end
-set CFLAGS=-Gw
-goto build_vc
-
-
-:build_sdk
+:build_vs2017
+set VC=15.0
 set PATH=%OPATH%
 set SUBSYS="5.01"
-call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /Release /ia64 /xp
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-ia64
-call build-ia64.cmd
-goto %NEXT%
+set OPTS=MY_STATIC_LINK=1 /NOLOGO
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
+call build-it.cmd
 
-:build_vc
-FOR /R .\ %%d IN (ARM X64 O) DO rd /S /Q %%d 2>NUL
-set PATH=%OPATH%
-set SUBSYS="5.01"
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x32
-call build-x32.cmd
 set PATH=%OPATH%
 set SUBSYS="5.02"
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_amd64
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-x64
-call build-x64.cmd
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+call build-it.cmd
+
+set PATH=%OPATH%
+set SUBSYS="6.02"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64_arm
+call build-it.cmd
+
 set PATH=%OPATH%
 set SUBSYS="6.02"
-call "C:\Program Files (x86)\Microsoft Visual Studio %VC%\VC\vcvarsall.bat" x86_arm
-set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-arm
-call build-arm.cmd
-goto %NEXT%
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64_arm64
+call build-it.cmd
+
+goto end
 
 :end
 cd %APPVEYOR_BUILD_FOLDER%
-set > env.txt
 7z a %APPVEYOR_PROJECT_NAME%-%APPVEYOR_BUILD_VERSION%.7z bin-* *.txt
diff --git a/CPP/build-arm.cmd b/CPP/build-arm.cmd
deleted file mode 100644
index 630d8ac3..00000000
--- a/CPP/build-arm.cmd
+++ /dev/null
@@ -1,101 +0,0 @@
-@echo off
-
-set ROOT=%cd%\7zip
-if not defined OUTDIR  set OUTDIR=%ROOT%\binArm
-if not defined ERRFILE set ERRFILE=%cd%\error.txt
-mkdir %OUTDIR%
-
-set OPTS=PLATFORM=arm MY_STATIC_LINK=1 /NOLOGO
-
-cd %ROOT%\Bundles\Format7zExtract
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7zxa.dll" >> %ERRFILE%
-copy arm\7zxa.dll %OUTDIR%\7zxa.dll
-
-cd %ROOT%\Bundles\Format7z
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7za.dll" >> %ERRFILE%
-copy arm\7za.dll %OUTDIR%\7za.dll
-
-cd %ROOT%\Bundles\Format7zF
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7z.dll" >> %ERRFILE%
-copy arm\7z.dll %OUTDIR%\7z.dll
-
-REM cd %ROOT%\UI\FileManager
-REM nmake %OPTS%
-REM IF %errorlevel% NEQ 0 echo "Error arm @ 7zFM.exe" >> %ERRFILE%
-REM copy arm\7zFM.exe %OUTDIR%\7zFM.exe
-
-REM cd %ROOT%\UI\GUI
-REM nmake %OPTS%
-REM IF %errorlevel% NEQ 0 echo "Error arm @ 7zG.exe" >> %ERRFILE%
-REM copy arm\7zG.exe %OUTDIR%\7zG.exe
-
-cd %ROOT%\UI\Explorer
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7-zip.dll" >> %ERRFILE%
-copy arm\7-zip.dll %OUTDIR%\7-zip.dll
-
-REM cd %ROOT%\Bundles\SFXWin
-REM nmake %OPTS%
-REM IF %errorlevel% NEQ 0 echo "Error arm @ 7z.sfx" >> %ERRFILE%
-REM copy arm\7z.sfx %OUTDIR%\7z.sfx
-
-cd %ROOT%\Bundles\Codec_brotli
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ brotli-arm.dll" >> %ERRFILE%
-copy arm\brotli.dll %OUTDIR%\brotli-arm.dll
-
-cd %ROOT%\Bundles\Codec_lizard
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ lizard-arm.dll" >> %ERRFILE%
-copy arm\lizard.dll %OUTDIR%\lizard-arm.dll
-
-cd %ROOT%\Bundles\Codec_lz4
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ lz4-arm.dll" >> %ERRFILE%
-copy arm\lz4.dll %OUTDIR%\lz4-arm.dll
-
-cd %ROOT%\Bundles\Codec_lz5
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ lz5-arm.dll" >> %ERRFILE%
-copy arm\lz5.dll %OUTDIR%\lz5-arm.dll
-
-cd %ROOT%\Bundles\Codec_zstd
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ zstd-arm.dll" >> %ERRFILE%
-copy arm\zstd.dll %OUTDIR%\zstd-arm.dll
-
-cd %ROOT%\Bundles\Codec_flzma2
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ flzma2-arm.dll" >> %ERRFILE%
-copy arm\flzma2.dll %OUTDIR%\flzma2-arm.dll
-
-REM cd %ROOT%\..\..\C\Util\7zipInstall
-REM nmake %OPTS%
-REM IF %errorlevel% NEQ 0 echo "Error arm @ Install-arm.exe" >> %ERRFILE%
-REM copy arm\7zipInstall.exe %OUTDIR%\Install-arm.exe
-
-REM cd %ROOT%\..\..\C\Util\7zipUninstall
-REM nmake %OPTS%
-REM IF %errorlevel% NEQ 0 echo "Error arm @ Uninstall.exe" >> %ERRFILE%
-REM copy arm\7zipUninstall.exe %OUTDIR%\Uninstall.exe
-
-cd %ROOT%\UI\Console
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7z.exe" >> %ERRFILE%
-copy arm\7z.exe %OUTDIR%\7z.exe
-
-cd %ROOT%\Bundles\SFXCon
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7zCon.sfx" >> %ERRFILE%
-copy arm\7zCon.sfx %OUTDIR%\7zCon.sfx
-
-cd %ROOT%\Bundles\Alone
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error arm @ 7za.exe" >> %ERRFILE%
-copy arm\7za.exe %OUTDIR%\7za.exe
-
-:ende
-cd %ROOT%\..
diff --git a/CPP/build-it.cmd b/CPP/build-it.cmd
new file mode 100644
index 00000000..660c4a5f
--- /dev/null
+++ b/CPP/build-it.cmd
@@ -0,0 +1,103 @@
+@echo off
+
+set ROOT=%cd%\7zip
+set OUTDIR=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-%PLATFORM%
+set ERRFILE=%APPVEYOR_BUILD_FOLDER%\bin-%VC%-%PLATFORM%.log
+set LFLAGS=/SUBSYSTEM:WINDOWS,%SUBSYS%
+set > %APPVEYOR_BUILD_FOLDER%\env-%VC%-%PLATFORM%.txt
+mkdir %OUTDIR%
+
+cd %ROOT%\Bundles\Format7zExtract
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zxa.dll" >> %ERRFILE%
+copy %PLATFORM%\7zxa.dll %OUTDIR%\7zxa.dll
+
+cd %ROOT%\Bundles\Format7z
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7za.dll" >> %ERRFILE%
+copy %PLATFORM%\7za.dll %OUTDIR%\7za.dll
+
+cd %ROOT%\Bundles\Format7zF
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7z.dll" >> %ERRFILE%
+copy %PLATFORM%\7z.dll %OUTDIR%\7z.dll
+
+cd %ROOT%\UI\FileManager
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zFM.exe" >> %ERRFILE%
+copy %PLATFORM%\7zFM.exe %OUTDIR%\7zFM.exe
+
+cd %ROOT%\UI\GUI
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zG.exe" >> %ERRFILE%
+copy %PLATFORM%\7zG.exe %OUTDIR%\7zG.exe
+
+cd %ROOT%\UI\Explorer
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7-zip.dll" >> %ERRFILE%
+copy %PLATFORM%\7-zip.dll %OUTDIR%\7-zip.dll
+
+cd %ROOT%\Bundles\SFXWin
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7z.sfx" >> %ERRFILE%
+copy %PLATFORM%\7z.sfx %OUTDIR%\7z.sfx
+
+cd %ROOT%\Bundles\Codec_brotli
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ brotli.dll" >> %ERRFILE%
+copy %PLATFORM%\brotli.dll %OUTDIR%\brotli.dll
+
+cd %ROOT%\Bundles\Codec_lizard
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ lizard.dll" >> %ERRFILE%
+copy %PLATFORM%\lizard.dll %OUTDIR%\lizard.dll
+
+cd %ROOT%\Bundles\Codec_lz4
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ lz4.dll" >> %ERRFILE%
+copy %PLATFORM%\lz4.dll %OUTDIR%\lz4.dll
+
+cd %ROOT%\Bundles\Codec_lz5
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ lz5.dll" >> %ERRFILE%
+copy %PLATFORM%\lz5.dll %OUTDIR%\lz5.dll
+
+cd %ROOT%\Bundles\Codec_zstd
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ zstd.dll" >> %ERRFILE%
+copy %PLATFORM%\zstd.dll %OUTDIR%\zstd.dll
+
+cd %ROOT%\Bundles\Codec_flzma2
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ flzma2.dll" >> %ERRFILE%
+copy %PLATFORM%\flzma2.dll %OUTDIR%\flzma2.dll
+
+cd %ROOT%\..\..\C\Util\7zipInstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ Install.exe" >> %ERRFILE%
+copy %PLATFORM%\7zipInstall.exe %OUTDIR%\Install.exe
+
+cd %ROOT%\..\..\C\Util\7zipUninstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ Uninstall.exe" >> %ERRFILE%
+copy %PLATFORM%\7zipUninstall.exe %OUTDIR%\Uninstall.exe
+
+set LFLAGS=/SUBSYSTEM:CONSOLE,%SUBSYS%
+cd %ROOT%\UI\Console
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7z.exe" >> %ERRFILE%
+copy %PLATFORM%\7z.exe %OUTDIR%\7z.exe
+
+cd %ROOT%\Bundles\SFXCon
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7zCon.sfx" >> %ERRFILE%
+copy %PLATFORM%\7zCon.sfx %OUTDIR%\7zCon.sfx
+
+cd %ROOT%\Bundles\Alone
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error @ 7za.exe" >> %ERRFILE%
+copy %PLATFORM%\7za.exe %OUTDIR%\7za.exe
+
+:ende
+cd %ROOT%\..
+
diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd
deleted file mode 100644
index 6ca283c2..00000000
--- a/CPP/build-x32.cmd
+++ /dev/null
@@ -1,104 +0,0 @@
-@echo off
-
-set ROOT=%cd%\7zip
-if not defined OUTDIR  set OUTDIR=%ROOT%\bin32
-if not defined ERRFILE set ERRFILE=%cd%\error.txt
-mkdir %OUTDIR%
-
-set OPTS=MY_STATIC_LINK=1 /NOLOGO
-set LFLAGS=/SUBSYSTEM:WINDOWS,%SUBSYS%
-
-cd %ROOT%\Bundles\Format7zExtract
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7zxa.dll" >> %ERRFILE%
-copy o\7zxa.dll %OUTDIR%\7zxa.dll
-
-cd %ROOT%\Bundles\Format7z
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7za.dll" >> %ERRFILE%
-copy o\7za.dll %OUTDIR%\7za.dll
-
-cd %ROOT%\Bundles\Format7zF
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7z.dll" >> %ERRFILE%
-copy o\7z.dll %OUTDIR%\7z.dll
-
-cd %ROOT%\UI\FileManager
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7zFM.exe" >> %ERRFILE%
-copy o\7zFM.exe %OUTDIR%\7zFM.exe
-
-cd %ROOT%\UI\GUI
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7zG.exe" >> %ERRFILE%
-copy o\7zG.exe %OUTDIR%\7zG.exe
-
-cd %ROOT%\UI\Explorer
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7-zip.dll" >> %ERRFILE%
-copy o\7-zip.dll %OUTDIR%\7-zip.dll
-
-cd %ROOT%\Bundles\SFXWin
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7z.sfx" >> %ERRFILE%
-copy o\7z.sfx %OUTDIR%\7z.sfx
-
-cd %ROOT%\Bundles\Codec_brotli
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ brotli-x32.dll" >> %ERRFILE%
-copy o\brotli.dll %OUTDIR%\brotli-x32.dll
-
-cd %ROOT%\Bundles\Codec_lizard
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ lizard-x32.dll" >> %ERRFILE%
-copy o\lizard.dll %OUTDIR%\lizard-x32.dll
-
-cd %ROOT%\Bundles\Codec_lz4
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ lz4-x32.dll" >> %ERRFILE%
-copy o\lz4.dll %OUTDIR%\lz4-x32.dll
-
-cd %ROOT%\Bundles\Codec_lz5
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ lz5-x32.dll" >> %ERRFILE%
-copy o\lz5.dll %OUTDIR%\lz5-x32.dll
-
-cd %ROOT%\Bundles\Codec_zstd
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ zstd-x32.dll" >> %ERRFILE%
-copy o\zstd.dll %OUTDIR%\zstd-x32.dll
-
-cd %ROOT%\Bundles\Codec_flzma2
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ flzma2-x32.dll" >> %ERRFILE%
-copy o\flzma2.dll %OUTDIR%\flzma2-x32.dll
-
-cd %ROOT%\..\..\C\Util\7zipInstall
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ Install-x32.exe" >> %ERRFILE%
-copy o\7zipInstall.exe %OUTDIR%\Install-x32.exe
-
-cd %ROOT%\..\..\C\Util\7zipUninstall
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ Uninstall.exe" >> %ERRFILE%
-copy o\7zipUninstall.exe %OUTDIR%\Uninstall.exe
-
-set LFLAGS=/SUBSYSTEM:CONSOLE,%SUBSYS%
-cd %ROOT%\UI\Console
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7z.exe" >> %ERRFILE%
-copy o\7z.exe %OUTDIR%\7z.exe
-
-cd %ROOT%\Bundles\SFXCon
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7zCon.sfx" >> %ERRFILE%
-copy o\7zCon.sfx %OUTDIR%\7zCon.sfx
-
-cd %ROOT%\Bundles\Alone
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x32 @ 7za.exe" >> %ERRFILE%
-copy o\7za.exe %OUTDIR%\7za.exe
-
-:ende
-cd %ROOT%\..
-
diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd
deleted file mode 100644
index a716bea3..00000000
--- a/CPP/build-x64.cmd
+++ /dev/null
@@ -1,103 +0,0 @@
-@echo off
-
-set ROOT=%cd%\7zip
-if not defined OUTDIR  set OUTDIR=%ROOT%\bin64
-if not defined ERRFILE set ERRFILE=%cd%\error.txt
-mkdir %OUTDIR%
-
-set OPTS=PLATFORM=x64 MY_STATIC_LINK=1 /NOLOGO
-set LFLAGS=/SUBSYSTEM:WINDOWS,%SUBSYS%
-
-cd %ROOT%\Bundles\Format7zExtract
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7zxa.dll" >> %ERRFILE%
-copy X64\7zxa.dll %OUTDIR%\7zxa.dll
-
-cd %ROOT%\Bundles\Format7z
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.dll" >> %ERRFILE%
-copy X64\7za.dll %OUTDIR%\7za.dll
-
-cd %ROOT%\Bundles\Format7zF
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE%
-copy X64\7z.dll %OUTDIR%\7z.dll
-
-cd %ROOT%\UI\FileManager
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE%
-copy X64\7zFM.exe %OUTDIR%\7zFM.exe
-
-cd %ROOT%\UI\GUI
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE%
-copy X64\7zG.exe %OUTDIR%\7zG.exe
-
-cd %ROOT%\UI\Explorer
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE%
-copy X64\7-zip.dll %OUTDIR%\7-zip.dll
-
-cd %ROOT%\Bundles\SFXWin
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> %ERRFILE%
-copy X64\7z.sfx %OUTDIR%\7z.sfx
-
-cd %ROOT%\Bundles\Codec_brotli
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ brotli-x64.dll" >> %ERRFILE%
-copy X64\brotli.dll %OUTDIR%\brotli-x64.dll
-
-cd %ROOT%\Bundles\Codec_lizard
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ lizard-x64.dll" >> %ERRFILE%
-copy X64\lizard.dll %OUTDIR%\lizard-x64.dll
-
-cd %ROOT%\Bundles\Codec_lz4
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ lz4-x64.dll" >> %ERRFILE%
-copy X64\lz4.dll %OUTDIR%\lz4-x64.dll
-
-cd %ROOT%\Bundles\Codec_lz5
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ lz5-x64.dll" >> %ERRFILE%
-copy X64\lz5.dll %OUTDIR%\lz5-x64.dll
-
-cd %ROOT%\Bundles\Codec_zstd
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ zstd-x64.dll" >> %ERRFILE%
-copy X64\zstd.dll %OUTDIR%\zstd-x64.dll
-
-cd %ROOT%\Bundles\Codec_flzma2
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ flzma2-x64.dll" >> %ERRFILE%
-copy X64\flzma2.dll %OUTDIR%\flzma2-x64.dll
-
-cd %ROOT%\..\..\C\Util\7zipInstall
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> %ERRFILE%
-copy X64\7zipInstall.exe %OUTDIR%\Install-x64.exe
-
-cd %ROOT%\..\..\C\Util\7zipUninstall
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE%
-copy X64\7zipUninstall.exe %OUTDIR%\Uninstall.exe
-
-set LFLAGS=/SUBSYSTEM:CONSOLE,%SUBSYS%
-cd %ROOT%\UI\Console
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE%
-copy X64\7z.exe %OUTDIR%\7z.exe
-
-cd %ROOT%\Bundles\SFXCon
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> %ERRFILE%
-copy X64\7zCon.sfx %OUTDIR%\7zCon.sfx
-
-cd %ROOT%\Bundles\Alone
-nmake %OPTS%
-IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.exe" >> %ERRFILE%
-copy X64\7za.exe %OUTDIR%\7za.exe
-
-:ende
-cd %ROOT%\..
diff --git a/cleanup.cmd b/cleanup.cmd
deleted file mode 100644
index 5b60af8d..00000000
--- a/cleanup.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-ren Asm\arm arm_
-FOR /R .\ %%d IN (arm x64 o) DO rd /S /Q %%d 2>NUL
-ren Asm\arm_ arm
-
-del "CPP\7zip\*.7z" 2>NUL
-del "CPP\7zip\*.exe" 2>NUL
-rd /S /Q "CPP\7zip\bin*" 2>NUL
-rd /S /Q "CPP\7zip\codecs" 2>NUL
-rd /S /Q "CPP\7zip\totalcmd" 2>NUL
-