From f623539c7392af1e5871fdc6c3b54733cbc21e34 Mon Sep 17 00:00:00 2001 From: glachancecmaisonneuve Date: Sat, 22 Dec 2018 19:18:21 -0500 Subject: [PATCH] v7 --- .gitignore | 9 ++- CPP/7zip/UI/Console/makefile | 3 + CPP/7zip/UI/FileManager/SystemPage.cpp | 6 +- CPP/7zip/UI/FileManager/makefile | 3 +- CPP/build-x64.cmd | 103 +++++++++++++++++++++++++ build.cmd | 101 +++++++++++++++++++----- 6 files changed, 200 insertions(+), 25 deletions(-) create mode 100644 CPP/build-x64.cmd diff --git a/.gitignore b/.gitignore index 43877450..e54739e2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,11 @@ out *.log *.pch *.idb -x64/ \ No newline at end of file +x64/ +*.exe +*.res +*.dll +*.lib +*.exp +*.sfx +*.txt diff --git a/CPP/7zip/UI/Console/makefile b/CPP/7zip/UI/Console/makefile index 98ad91c2..ed3c476c 100644 --- a/CPP/7zip/UI/Console/makefile +++ b/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 \ diff --git a/CPP/7zip/UI/FileManager/SystemPage.cpp b/CPP/7zip/UI/FileManager/SystemPage.cpp index 05a0d058..44a313f3 100644 --- a/CPP/7zip/UI/FileManager/SystemPage.cpp +++ b/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; }; diff --git a/CPP/7zip/UI/FileManager/makefile b/CPP/7zip/UI/FileManager/makefile index 553bcfcb..cc4a95cd 100644 --- a/CPP/7zip/UI/FileManager/makefile +++ b/CPP/7zip/UI/FileManager/makefile @@ -23,8 +23,7 @@ COMMON_OBJS = \ $O\StringConvert.obj \ $O\StringToInt.obj \ $O\UTFConvert.obj \ - $O\Wildcard.obj \ - $O\LoadCodecs.obj \ + $O\Wildcard.obj WIN_OBJS = $(WIN_OBJS) \ $O\Clipboard.obj \ diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd new file mode 100644 index 00000000..a5f956d1 --- /dev/null +++ b/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%\.. diff --git a/build.cmd b/build.cmd index 40b3199b..0db65941 100644 --- a/build.cmd +++ b/build.cmd @@ -1,30 +1,93 @@ -set NEW_COMPILER=1 -set NEW_FOLDER_INTERFACE=1 -set MY_STATIC_BUILD=0 -set CPU=AMD64 -set O=%~dp0out +@echo off -rem old build -rd /y /q %~dp0out +set OPTS=CPU=AMD64 MY_STATIC_LINK=1 _SFX=1 +set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" -rem 7-zip.dll -pushd CPP\7zip\UI\Explorer -nmake /I /A +set O=%~dp0out\FileManager +mkdir %O% +pushd %~dp0CPP\7zip\UI\FileManager +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE% popd -rem 7zFM.exe -pushd CPP\7zip\UI\FileManager -nmake /I /A +set O=%~dp0out\GUI +mkdir %O% +pushd %~dp0CPP\7zip\UI\GUI +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE% popd -rem 7zG.exe -pushd CPP\7zip\UI\GUI -nmake /I /A +set O=%~dp0out\Explorer +mkdir %O% +pushd %~dp0CPP\7zip\UI\Explorer +nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE% popd -rem 7z.exe -pushd CPP\7zip\UI\Console -nmake /I /A +set O=%~dp0out\SFXWin +mkdir %O% +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 \ No newline at end of file