v7

.gitignore

@@ -8,4 +8,11 @@ out
 *.log
 *.pch
 *.idb
-x64/
+x64/
+*.exe
+*.res
+*.dll
+*.lib
+*.exp
+*.sfx
+*.txt

CPP/7zip/UI/Console/makefile

@@ -21,6 +21,8 @@ COMMON_OBJS = \
   $O\UTFConvert.obj \
   $O\MyVector.obj \
   $O\Wildcard.obj \
+  $O\ResourceString.obj \
+  
 
 WIN_OBJS = \
   $O\DLL.obj \
@@ -37,6 +39,7 @@ WIN_OBJS = \
   $O\Registry.obj \
   $O\System.obj \
   $O\TimeUtils.obj \
+  $O\LoadCodecs.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \

CPP/7zip/UI/FileManager/SystemPage.cpp

@@ -35,11 +35,11 @@ static const UInt32 kLangIDs[] =
 CSysString CModifiedExtInfo::GetString() const
 {
   if (State == kExtState_7Zip)
-    return AString("7-Zip");
+    return UString("7-Zip");
   if (State == kExtState_Clear)
-    return AString("");
+    return UString("");
   if (Other7Zip)
-    return AString("[7-Zip]");
+    return UString("[7-Zip]");
   return ProgramKey;
 };
 

CPP/7zip/UI/FileManager/makefile

@@ -23,8 +23,7 @@ COMMON_OBJS = \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
   $O\UTFConvert.obj \
-  $O\Wildcard.obj \
+  $O\Wildcard.obj
-  $O\LoadCodecs.obj \
 
 WIN_OBJS = $(WIN_OBJS) \
   $O\Clipboard.obj \

CPP/build-x64.cmd

@@ -0,0 +1,103 @@
+@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=CPU=AMD64 MY_STATIC_LINK=1 /NOLOGO
+set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02"
+
+cd %ROOT%\Bundles\Format7zExtract
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zxa.dll" >> %ERRFILE%
+copy AMD64\7zxa.dll %OUTDIR%\7zxa.dll
+
+cd %ROOT%\Bundles\Format7z
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.dll" >> %ERRFILE%
+copy AMD64\7za.dll %OUTDIR%\7za.dll
+
+cd %ROOT%\Bundles\Format7zF
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE%
+copy AMD64\7z.dll %OUTDIR%\7z.dll
+
+cd %ROOT%\UI\FileManager
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE%
+copy AMD64\7zFM.exe %OUTDIR%\7zFM.exe
+
+cd %ROOT%\UI\GUI
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE%
+copy AMD64\7zG.exe %OUTDIR%\7zG.exe
+
+cd %ROOT%\UI\Explorer
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE%
+copy AMD64\7-zip.dll %OUTDIR%\7-zip.dll
+
+cd %ROOT%\Bundles\SFXWin
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> %ERRFILE%
+copy AMD64\7z.sfx %OUTDIR%\7z.sfx
+
+cd %ROOT%\Bundles\Codec_brotli
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ brotli-x64.dll" >> %ERRFILE%
+copy AMD64\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 AMD64\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 AMD64\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 AMD64\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 AMD64\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 AMD64\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 AMD64\7zipInstall.exe %OUTDIR%\Install-x64.exe
+
+cd %ROOT%\..\..\C\Util\7zipUninstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE%
+copy AMD64\7zipUninstall.exe %OUTDIR%\Uninstall.exe
+
+set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02"
+cd %ROOT%\UI\Console
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE%
+copy AMD64\7z.exe %OUTDIR%\7z.exe
+
+cd %ROOT%\Bundles\SFXCon
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> %ERRFILE%
+copy AMD64\7zCon.sfx %OUTDIR%\7zCon.sfx
+
+cd %ROOT%\Bundles\Alone
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.exe" >> %ERRFILE%
+copy AMD64\7za.exe %OUTDIR%\7za.exe
+
+:ende
+cd %ROOT%\..

build.cmd

@@ -1,30 +1,93 @@
-set NEW_COMPILER=1
+@echo off
-set NEW_FOLDER_INTERFACE=1
-set MY_STATIC_BUILD=0
-set CPU=AMD64
-set O=%~dp0out
 
-rem old build
+set OPTS=CPU=AMD64 MY_STATIC_LINK=1 _SFX=1
-rd /y /q %~dp0out
+set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02"
 
-rem 7-zip.dll
+set O=%~dp0out\FileManager
-pushd CPP\7zip\UI\Explorer
+mkdir %O%
-nmake /I /A
+pushd %~dp0CPP\7zip\UI\FileManager
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE%
 popd
 
-rem 7zFM.exe
+set O=%~dp0out\GUI
-pushd CPP\7zip\UI\FileManager
+mkdir %O%
-nmake /I /A
+pushd %~dp0CPP\7zip\UI\GUI
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE%
 popd
 
-rem 7zG.exe
+set O=%~dp0out\Explorer
-pushd CPP\7zip\UI\GUI
+mkdir %O%
-nmake /I /A
+pushd %~dp0CPP\7zip\UI\Explorer
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE%
 popd
 
-rem 7z.exe
+set O=%~dp0out\SFXWin
-pushd CPP\7zip\UI\Console
+mkdir %O%
-nmake /I /A
+pushd %~dp0CPP\7zip\Bundles\SFXWin
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> %ERRFILE%
+popd
+
+set O=%~dp0out\7zipInstall
+mkdir %O%
+pushd %~dp0C\Util\7zipInstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> %ERRFILE%
+popd
+
+set O=%~dp0out\7zipUninstall
+mkdir %O%
+pushd %~dp0C\Util\7zipUninstall
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE%
+popd
+
+set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02"
+
+set O=%~dp0out\Console
+mkdir %O%
+pushd %~dp0CPP\7zip\UI\Console
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE%
+popd
+
+
+set O=%~dp0out\SFXCon
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\SFXCon
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> %ERRFILE%
+popd
+
+set O=%~dp0out\Alone
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\Alone
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.exe" >> %ERRFILE%
+popd
+
+set O=%~dp0out\Format7z
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\Format7z
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7za.dll" >> %ERRFILE%
+popd
+
+set O=%~dp0out\Format7zF
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\Format7zF
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> %ERRFILE%
+popd
+
+set O=%~dp0out\Format7zExtract
+mkdir %O%
+pushd %~dp0CPP\7zip\Bundles\Format7zExtract
+nmake %OPTS%
+IF %errorlevel% NEQ 0 echo "Error x64 @ 7zxa.dll" >> %ERRFILE%
 popd
 
 explorer.exe %~dp0out