diff --git a/CPP/7zip/Bundles/Fm/7zfm.vcxproj b/CPP/7zip/Bundles/Fm/7zfm.vcxproj new file mode 100644 index 00000000..88964a93 --- /dev/null +++ b/CPP/7zip/Bundles/Fm/7zfm.vcxproj @@ -0,0 +1,42 @@ + + + + + Release + x64 + + + + 15.0 + {2E507455-9726-46EE-8DE1-10B26C238535} + Win32Proj + + + + Makefile + false + v141 + + + + + + + + + + +SET CPU=AMD64 +SET MY_STATIC_LINK=1 +SET _SFX=1 +SET O=$(OutDir).TrimEnd('\') +SET LFLAGS=/DEBUG /SUBSYSTEM:WINDOWS,"5.02" +nmake /f Makefile + + NDEBUG;$(NMakePreprocessorDefinitions) + + + + + + \ No newline at end of file diff --git a/build.cmd b/build.cmd index 0db65941..89190948 100644 --- a/build.cmd +++ b/build.cmd @@ -1,93 +1,132 @@ @echo off - set OPTS=CPU=AMD64 MY_STATIC_LINK=1 _SFX=1 -set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" +set LFLAGS=/DEBUG /SUBSYSTEM:WINDOWS,"5.02" + +@echo ^_^_^_^_^_ ^_ ^_ ^_^_ ^_^_ +@echo ^| ^_^_^_(^_) ^| ^_^_^_^| \^/ ^| ^_^_ ^_ ^_ ^_^_ ^_^_ ^_ ^_^_ ^_ ^_^_^_ ^_ ^_^_ +@echo ^| ^|^_ ^| ^| ^|^/ ^_ \ ^|\^/^| ^|^/ ^_^` ^| '^_ \ ^/ ^_^` ^|^/ ^_^` ^|^/ ^_ \ '^_^_^| +@echo ^| ^_^| ^| ^| ^| ^_^_^/ ^| ^| ^| (^_^| ^| ^| ^| ^| (^_^| ^| (^_^| ^| ^_^_^/ ^| +@echo ^|^_^| ^|^_^|^_^|\^_^_^_^|^_^| ^|^_^|\^_^_,^_^|^_^| ^|^_^|\^_^_,^_^|\^_^_, ^|\^_^_^_^|^_^| +@echo ^|^_^_^_^/ +@echo set O=%~dp0out\FileManager mkdir %O% pushd %~dp0CPP\7zip\UI\FileManager nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zFM.exe" >> errorfile.txt popd +@echo ^_^_^_^_^_ ^_^_^_^_ ^_ ^_ ^_^_^_ +@echo ^|^_^_^_ ^|^_^_^_^/ ^_^_^_^| ^| ^| ^|^_ ^_^| +@echo ^/ ^/^_ ^/ ^| ^_^| ^| ^| ^|^| ^| +@echo ^/ ^/ ^/ ^/^| ^|^_^| ^| ^|^_^| ^|^| ^| +@echo ^/^_^/ ^/^_^_^_^|\^_^_^_^_^|\^_^_^_^/^|^_^_^_^| + set O=%~dp0out\GUI mkdir %O% pushd %~dp0CPP\7zip\UI\GUI nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zG.exe" >> errorfile.txt popd +@echo ^_^_^_^_^_ ^_^_^_^_^_ ^_ +@echo ^|^_^_^_ ^|^_^_^| ^_^_^_^_^|^_ ^_^_^_ ^_^_ ^| ^| ^_^_^_ ^_ ^_^_ ^_^_^_ ^_ ^_^_ +@echo ^/ ^/^_ ^/ ^_^| \ \^/ ^/ '^_ \^| ^|^/ ^_ \^| '^_^_^/ ^_ \ '^_^_^| +@echo ^/ ^/ ^/ ^/^| ^|^_^_^_ ^> ^<^| ^|^_) ^| ^| (^_) ^| ^| ^| ^_^_^/ ^| +@echo ^/^_^/ ^/^_^_^_^|^_^_^_^_^_^/^_^/\^_\ .^_^_^/^|^_^|\^_^_^_^/^|^_^| \^_^_^_^|^_^| +@echo ^|^_^| + set O=%~dp0out\Explorer mkdir %O% pushd %~dp0CPP\7zip\UI\Explorer nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7-zip.dll" >> errorfile.txt popd +@echo ^_^_^_^_ ^_^_ ^_^_ ^_^_^_ +@echo ^/ ^_^_^_^| ^/ ^_^|^_ ^_\ \ ^/ (^_)^_ ^_^_ +@echo \^_^_^_ \^| ^|^_\ \^/ ^/\ \ ^/\ ^/ ^/^| ^| '^_ \ +@echo ^_^_^_) ^| ^_^|^> ^< \ V V ^/ ^| ^| ^| ^| ^| +@echo ^|^_^_^_^_^/^|^_^| ^/^_^/\^_\ \^_^/\^_^/ ^|^_^|^_^| ^|^_^| + + set O=%~dp0out\SFXWin mkdir %O% pushd %~dp0CPP\7zip\Bundles\SFXWin nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.sfx" >> errorfile.txt popd +@echo ^_^_^_^_^_ ^_ ^_^_^_ ^_ ^_ ^_ +@echo ^|^_^_^_ ^|^_^_(^_)^_ ^_^_^|^_ ^_^|^_ ^_^_ ^_^_^_^| ^|^_ ^_^_ ^_^| ^| ^| +@echo ^/ ^/^_ ^/ ^| '^_ \^| ^|^| '^_ \^/ ^_^_^| ^_^_^/ ^_^` ^| ^| ^| +@echo ^/ ^/ ^/ ^/^| ^| ^|^_) ^| ^|^| ^| ^| \^_^_ \ ^|^| (^_^| ^| ^| ^| +@echo ^/^_^/ ^/^_^_^_^|^_^| .^_^_^/^_^_^_^|^_^| ^|^_^|^_^_^_^/\^_^_\^_^_,^_^|^_^|^_^| +@echo ^|^_^| + set O=%~dp0out\7zipInstall mkdir %O% pushd %~dp0C\Util\7zipInstall nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ Install-x64.exe" >> errorfile.txt popd +@echo ^_^_^_^_^_ ^_ ^_ ^_ ^_^_^_ ^_ ^_ ^_ +@echo ^|^_^_^_ ^|^_^_(^_)^_ ^_^_ ^| ^| ^| ^|^_ ^_^_ ^|^_ ^_^|^_ ^_^_ ^_^_^_^| ^|^_ ^_^_ ^_^| ^| ^| +@echo ^/ ^/^_ ^/ ^| '^_ \^| ^| ^| ^| '^_ \ ^| ^|^| '^_ \^/ ^_^_^| ^_^_^/ ^_^` ^| ^| ^| +@echo ^/ ^/ ^/ ^/^| ^| ^|^_) ^| ^|^_^| ^| ^| ^| ^|^| ^|^| ^| ^| \^_^_ \ ^|^| (^_^| ^| ^| ^| +@echo ^/^_^/ ^/^_^_^_^|^_^| .^_^_^/ \^_^_^_^/^|^_^| ^|^_^|^_^_^_^|^_^| ^|^_^|^_^_^_^/\^_^_\^_^_,^_^|^_^|^_^| +@echo ^|^_^| + set O=%~dp0out\7zipUninstall mkdir %O% pushd %~dp0C\Util\7zipUninstall nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ Uninstall.exe" >> errorfile.txt popd set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02" +@echo ^_^_^_^_^_ ^_^_^_^_ ^_ +@echo ^|^_^_^_ ^|^_^_^_^/ ^_^_^_^|^_^_^_ ^_ ^_^_ ^_^_^_ ^_^_^_ ^| ^| ^_^_^_ +@echo ^/ ^/^_ ^/ ^| ^/ ^_ \^| '^_ \^/ ^_^_^|^/ ^_ \^| ^|^/ ^_ \ +@echo ^/ ^/ ^/ ^/^| ^|^_^_^| (^_) ^| ^| ^| \^_^_ \ (^_) ^| ^| ^_^_^/ +@echo ^/^_^/ ^/^_^_^_^|\^_^_^_^_\^_^_^_^/^|^_^| ^|^_^|^_^_^_^/\^_^_^_^/^|^_^|\^_^_^_^| + set O=%~dp0out\Console mkdir %O% pushd %~dp0CPP\7zip\UI\Console nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.exe" >> errorfile.txt popd +@echo ^_^_ ^_ +@echo ^_^_^_ ^/ ^_^|^_ ^_^_^_^_^_ ^_^_^_ ^_ ^_^_ ^_^_^_ ^_^_^_ ^| ^| ^_^_^_ +@echo ^/ ^_^_^| ^|^_\ \^/ ^/ ^_^_^/ ^_ \^| '^_ \^/ ^_^_^|^/ ^_ \^| ^|^/ ^_ \ +@echo \^_^_ \ ^_^|^> ^< (^_^| (^_) ^| ^| ^| \^_^_ \ (^_) ^| ^| ^_^_^/ +@echo ^|^_^_^_^/^_^| ^/^_^/\^_\^_^_^_\^_^_^_^/^|^_^| ^|^_^|^_^_^_^/\^_^_^_^/^|^_^|\^_^_^_^| set O=%~dp0out\SFXCon mkdir %O% pushd %~dp0CPP\7zip\Bundles\SFXCon nmake %OPTS% -IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> %ERRFILE% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zCon.sfx" >> errorfile.txt 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 +@echo ^_^_ ^_ ^_^_^_^_^_ +@echo ^/ ^_^| ^_^_^_ ^_ ^_^_ ^_ ^_^_ ^_^_^_ ^_^_ ^_^| ^|^|^_^_^_ ^|^_^_^_ +@echo ^| ^|^_ ^/ ^_ \^| '^_^_^| '^_ ^` ^_ \ ^/ ^_^` ^| ^_^_^| ^/ ^/^_ ^/ +@echo ^| ^_^| (^_) ^| ^| ^| ^| ^| ^| ^| ^| (^_^| ^| ^|^_ ^/ ^/ ^/ ^/ +@echo ^|^_^| \^_^_^_^/^|^_^| ^|^_^| ^|^_^| ^|^_^|\^_^_,^_^|\^_^_^/^_^/ ^/^_^_^_^| 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% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7z.dll" >> errorfile.txt popd +cd /d %~dp0out +powershell -Command "Copy-Item .\*\*\*.exe,.\*\*\*.dll,.\*\*\*.lib,.\*\*\*.pdb -Destination .\out\" explorer.exe %~dp0out \ No newline at end of file