From 6b0b1ab05c4d929cc24a244be5106002663e56df Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Tue, 11 Apr 2017 10:43:41 +0300 Subject: [PATCH] Build 7za.exe that includes Zstd/LZ4/LZ5 too, to better match what p7zip-zstd does --- CPP/7zip/Bundles/Alone/makefile | 53 +++++++++++++++++++++++++++++++++ CPP/build-x32.cmd | 4 +++ CPP/build-x64.cmd | 4 +++ 3 files changed, 61 insertions(+) diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile index 504cdd62..cc81d650 100644 --- a/CPP/7zip/Bundles/Alone/makefile +++ b/CPP/7zip/Bundles/Alone/makefile @@ -215,6 +215,59 @@ C_OBJS = \ $O\XzEnc.obj \ $O\XzIn.obj \ +COMPRESS_OBJS = $(COMPRESS_OBJS) \ + $O\Lz4Decoder.obj \ + $O\Lz4Encoder.obj \ + $O\Lz4Register.obj \ + $O\Lz5Decoder.obj \ + $O\Lz5Encoder.obj \ + $O\Lz5Register.obj \ + $O\ZstdDecoder.obj \ + $O\ZstdEncoder.obj \ + $O\ZstdRegister.obj \ + +LZ4_OBJS = \ + $O\lz4.obj \ + $O\lz4frame.obj \ + $O\lz4hc.obj \ + $O\lz4xxhash.obj \ + +LZ5_OBJS = \ + $O\lz5.obj \ + $O\lz5frame.obj \ + $O\lz5hc.obj \ + +ZSTD_OBJS = \ + $O\entropy_common.obj \ + $O\fse_decompress.obj \ + $O\huf_decompress.obj \ + $O\zstd_common.obj \ + $O\zstd_decompress.obj \ + $O\xxhash.obj \ + $O\fse_compress.obj \ + $O\huf_compress.obj \ + $O\zstd_compress.obj \ + $O\error_private.obj \ + $O\zstd_v01.obj \ + $O\zstd_v02.obj \ + $O\zstd_v03.obj \ + $O\zstd_v04.obj \ + $O\zstd_v05.obj \ + $O\zstd_v06.obj \ + $O\zstd_v07.obj \ + +ZSTDMT_OBJS = \ + $O\lz5mt_common.obj \ + $O\lz5mt_compress.obj \ + $O\lz5mt_decompress.obj \ + $O\lz4mt_common.obj \ + $O\lz4mt_compress.obj \ + $O\lz4mt_decompress.obj \ + $O\threading.obj \ + $O\zstdmt_common.obj \ + $O\zstdmt_compress.obj \ + $O\zstdmt_decompress.obj \ + !include "../../UI/Console/Console.mak" !include "../../Aes.mak" diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd index e9d7c423..6173968a 100644 --- a/CPP/build-x32.cmd +++ b/CPP/build-x32.cmd @@ -60,5 +60,9 @@ cd %ROOT%\Bundles\SFXCon nmake %OPTS% copy O\7zCon.sfx %OUTDIR%\7zCon.sfx +cd %ROOT%\Bundles\Alone +nmake %OPTS% +copy O\7za.exe %OUTDIR%\7za.exe + :ende cd %ROOT%\.. diff --git a/CPP/build-x64.cmd b/CPP/build-x64.cmd index 44d22573..3c746b91 100644 --- a/CPP/build-x64.cmd +++ b/CPP/build-x64.cmd @@ -60,5 +60,9 @@ cd %ROOT%\Bundles\SFXCon nmake %OPTS% copy AMD64\7zCon.sfx %OUTDIR%\7zCon.sfx +cd %ROOT%\Bundles\Alone +nmake %OPTS% +copy AMD64\7za.exe %OUTDIR%\7za.exe + :ende cd %ROOT%\..