From c9b085e4ec6daeb7f18d30032f465a0422a23f6a Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Sun, 21 Oct 2018 14:46:06 +0200 Subject: [PATCH] Add some compiling fixes and choose compiler (vc12 + sdk71 for ia64) - add some pragma definitions to brotli port.h - change lz4 code, to include zstd/xxhash.h - fix various objects in makefile's - fix LzHandler.cpp, LZIP has now 0xC5 @ Guid.txt - improve logging on AppVeyor - fix version numbers in codecs - rename "Codec_zstdF" to "Codec_zstd_legacy" - add missing objects for lizard --- C/brotli/Brotli-Adjust.sh | 1 + C/brotli/port.h | 8 ++++ C/lz4/lz4frame.c | 2 +- CPP/7zip/Archive/LzHandler.cpp | 2 +- CPP/7zip/Bundles/Alone/makefile | 14 ++++-- CPP/7zip/Bundles/Codec_brotli/makefile | 12 +++-- CPP/7zip/Bundles/Codec_brotli/resource.rc | 2 +- CPP/7zip/Bundles/Codec_lizard/makefile | 8 ++-- CPP/7zip/Bundles/Codec_lz4/resource.rc | 2 +- CPP/7zip/Bundles/Codec_zstd/makefile | 2 + CPP/7zip/Bundles/Codec_zstd/resource.rc | 2 +- CPP/7zip/Bundles/Codec_zstdF/makefile | 2 + CPP/7zip/Bundles/Codec_zstdF/resource.rc | 2 +- CPP/7zip/Bundles/Format7z/makefile | 19 +++++--- CPP/7zip/Bundles/Format7zExtract/makefile | 16 ++++--- CPP/7zip/Bundles/Format7zF/makefile | 14 ++++-- CPP/7zip/Bundles/Format7zFO/Arc.mak | 4 ++ CPP/7zip/Bundles/Format7zFO/Format7z.dsp | 58 +++++++++++++++++++++++ CPP/7zip/Bundles/Format7zFO/makefile | 18 ++++--- CPP/7zip/Bundles/Format7zUSB/makefile | 21 +++++--- CPP/7zip/Bundles/SFXCon/makefile | 25 +++++++--- CPP/7zip/Bundles/SFXWin/makefile | 25 +++++++--- CPP/appveyor.cmd | 10 ++-- CPP/build-ia64.cmd | 23 ++++++++- CPP/build-x32.cmd | 24 +++++++++- CPP/build-x64.cmd | 24 +++++++++- README.md | 4 +- 27 files changed, 269 insertions(+), 75 deletions(-) diff --git a/C/brotli/Brotli-Adjust.sh b/C/brotli/Brotli-Adjust.sh index 1e76e6d8..d2ca94f9 100755 --- a/C/brotli/Brotli-Adjust.sh +++ b/C/brotli/Brotli-Adjust.sh @@ -40,5 +40,6 @@ exit # pragma warning(disable : 4100) # pragma warning(disable : 4127) +# pragma warning(disable : 4295) # pragma warning(disable : 4389) # pragma warning(disable : 4701) diff --git a/C/brotli/port.h b/C/brotli/port.h index 20dc2314..d8996402 100644 --- a/C/brotli/port.h +++ b/C/brotli/port.h @@ -9,6 +9,14 @@ #ifndef BROTLI_COMMON_PORT_H_ #define BROTLI_COMMON_PORT_H_ +/* disable some warnings /TR */ +#pragma warning(disable : 4100) +#pragma warning(disable : 4127) +#pragma warning(disable : 4189) +#pragma warning(disable : 4295) +#pragma warning(disable : 4389) +#pragma warning(disable : 4701) + /* The following macros were borrowed from https://github.com/nemequ/hedley * with permission of original author - Evan Nemerson */ diff --git a/C/lz4/lz4frame.c b/C/lz4/lz4frame.c index 08bf0fae..5207f377 100644 --- a/C/lz4/lz4frame.c +++ b/C/lz4/lz4frame.c @@ -80,7 +80,7 @@ You can contact the author at : #define LZ4_HC_STATIC_LINKING_ONLY #include "lz4hc.h" #define XXH_STATIC_LINKING_ONLY -#include "xxhash.h" +#include "../zstd/xxhash.h" /*-************************************ diff --git a/CPP/7zip/Archive/LzHandler.cpp b/CPP/7zip/Archive/LzHandler.cpp index bd242bc4..f936f9ca 100644 --- a/CPP/7zip/Archive/LzHandler.cpp +++ b/CPP/7zip/Archive/LzHandler.cpp @@ -451,7 +451,7 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems, } REGISTER_ARC_I( - "lzip", "lz tlz", "* .tar", 0xC6, + "lzip", "lz tlz", "* .tar", 0xC5, k_Signature, 0, NArcInfoFlags::kKeepName, diff --git a/CPP/7zip/Bundles/Alone/makefile b/CPP/7zip/Bundles/Alone/makefile index 4b55bad8..f95c6bce 100644 --- a/CPP/7zip/Bundles/Alone/makefile +++ b/CPP/7zip/Bundles/Alone/makefile @@ -236,27 +236,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ LIZARD_OBJS = \ @@ -275,10 +277,12 @@ LZ5_OBJS = \ $O\lz5hc.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Codec_brotli/makefile b/CPP/7zip/Bundles/Codec_brotli/makefile index e549b8bb..9a769011 100644 --- a/CPP/7zip/Bundles/Codec_brotli/makefile +++ b/CPP/7zip/Bundles/Codec_brotli/makefile @@ -22,27 +22,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\BrotliRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ ZSTDMT_OBJS = \ diff --git a/CPP/7zip/Bundles/Codec_brotli/resource.rc b/CPP/7zip/Bundles/Codec_brotli/resource.rc index 07a53a45..fba52315 100644 --- a/CPP/7zip/Bundles/Codec_brotli/resource.rc +++ b/CPP/7zip/Bundles/Codec_brotli/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip Brotli Plugin v1.0.1", "Brotli") +MY_VERSION_INFO_DLL("7-Zip Brotli Plugin v1.0.6", "Brotli") 101 ICON "../../Archive/Icons/7z.ico" diff --git a/CPP/7zip/Bundles/Codec_lizard/makefile b/CPP/7zip/Bundles/Codec_lizard/makefile index 457cc762..a97e5e41 100644 --- a/CPP/7zip/Bundles/Codec_lizard/makefile +++ b/CPP/7zip/Bundles/Codec_lizard/makefile @@ -27,13 +27,15 @@ LIZARD_OBJS = \ $O/lizard_frame.obj \ ZSTD_OBJS = \ - $O\xxhash.obj \ + $O\debug.obj \ $O\entropy_common.obj \ - $O\fse_decompress.obj \ + $O\error_private.obj \ $O\fse_compress.obj \ + $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ - $O\error_private.obj \ + $O\xxhash.obj \ ZSTDMT_OBJS = \ $O\lizard-mt_common.obj \ diff --git a/CPP/7zip/Bundles/Codec_lz4/resource.rc b/CPP/7zip/Bundles/Codec_lz4/resource.rc index 2cd1f89e..25847c3b 100644 --- a/CPP/7zip/Bundles/Codec_lz4/resource.rc +++ b/CPP/7zip/Bundles/Codec_lz4/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip LZ4 Plugin v1.8.0", "Lz4") +MY_VERSION_INFO_DLL("7-Zip LZ4 Plugin v1.8.3", "Lz4") 101 ICON "../../Archive/Icons/lz4.ico" diff --git a/CPP/7zip/Bundles/Codec_zstd/makefile b/CPP/7zip/Bundles/Codec_zstd/makefile index f04a97e0..47e93b60 100644 --- a/CPP/7zip/Bundles/Codec_zstd/makefile +++ b/CPP/7zip/Bundles/Codec_zstd/makefile @@ -22,10 +22,12 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Codec_zstd/resource.rc b/CPP/7zip/Bundles/Codec_zstd/resource.rc index b0dbd5a9..f7e227bd 100644 --- a/CPP/7zip/Bundles/Codec_zstd/resource.rc +++ b/CPP/7zip/Bundles/Codec_zstd/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.2", "zstd") +MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.6", "zstd") 101 ICON "../../Archive/Icons/zst.ico" diff --git a/CPP/7zip/Bundles/Codec_zstdF/makefile b/CPP/7zip/Bundles/Codec_zstdF/makefile index f8618246..0ddfd93e 100644 --- a/CPP/7zip/Bundles/Codec_zstdF/makefile +++ b/CPP/7zip/Bundles/Codec_zstdF/makefile @@ -22,10 +22,12 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Codec_zstdF/resource.rc b/CPP/7zip/Bundles/Codec_zstdF/resource.rc index b0dbd5a9..f7e227bd 100644 --- a/CPP/7zip/Bundles/Codec_zstdF/resource.rc +++ b/CPP/7zip/Bundles/Codec_zstdF/resource.rc @@ -1,6 +1,6 @@ #include "../../../../C/7zVersionTr.h" #include "../../../../C/7zVersion.rc" -MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.2", "zstd") +MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.6", "zstd") 101 ICON "../../Archive/Icons/zst.ico" diff --git a/CPP/7zip/Bundles/Format7z/makefile b/CPP/7zip/Bundles/Format7z/makefile index 7ecffd0a..35a96149 100644 --- a/CPP/7zip/Bundles/Format7z/makefile +++ b/CPP/7zip/Bundles/Format7z/makefile @@ -53,6 +53,7 @@ AR_COMMON_OBJS = \ $O\OutStreamWithCRC.obj \ $O\ParseProperties.obj \ + 7Z_OBJS = \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ @@ -81,13 +82,13 @@ COMPRESS_OBJS = \ $O\BranchRegister.obj \ $O\ByteSwap.obj \ $O\BZip2Crc.obj \ - $O\BZip2Encoder.obj \ $O\BZip2Decoder.obj \ + $O\BZip2Encoder.obj \ $O\BZip2Register.obj \ $O\CopyCoder.obj \ $O\CopyRegister.obj \ - $O\DeflateEncoder.obj \ $O\DeflateDecoder.obj \ + $O\DeflateEncoder.obj \ $O\DeflateRegister.obj \ $O\DeltaFilter.obj \ $O\Lzma2Decoder.obj \ @@ -157,27 +158,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ LIZARD_OBJS = \ @@ -196,10 +199,12 @@ LZ5_OBJS = \ $O\lz5hc.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Format7zExtract/makefile b/CPP/7zip/Bundles/Format7zExtract/makefile index 56c83577..b219b39c 100644 --- a/CPP/7zip/Bundles/Format7zExtract/makefile +++ b/CPP/7zip/Bundles/Format7zExtract/makefile @@ -121,27 +121,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_dictionary_hash.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ + $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ LIZARD_OBJS = \ @@ -160,10 +162,12 @@ LZ5_OBJS = \ $O\lz5hc.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile index 70a84550..69537076 100644 --- a/CPP/7zip/Bundles/Format7zF/makefile +++ b/CPP/7zip/Bundles/Format7zF/makefile @@ -34,27 +34,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ LIZARD_OBJS = \ @@ -73,10 +75,12 @@ LZ5_OBJS = \ $O\lz5hc.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Format7zFO/Arc.mak b/CPP/7zip/Bundles/Format7zFO/Arc.mak index 5e7ba6f8..b78e4c1b 100644 --- a/CPP/7zip/Bundles/Format7zFO/Arc.mak +++ b/CPP/7zip/Bundles/Format7zFO/Arc.mak @@ -202,6 +202,7 @@ COMPRESS_OBJS = \ $O\DeflateRegister.obj \ $O\DeltaFilter.obj \ $O\ImplodeDecoder.obj \ + $O\LzfseDecoder.obj \ $O\LzhDecoder.obj \ $O\Lzma2Decoder.obj \ $O\Lzma2Encoder.obj \ @@ -265,10 +266,12 @@ C_OBJS = \ $O\LzFind.obj \ $O\LzFindMt.obj \ $O\Lzma2Dec.obj \ + $O\Lzma2DecMt.obj \ $O\Lzma2Enc.obj \ $O\LzmaDec.obj \ $O\LzmaEnc.obj \ $O\MtCoder.obj \ + $O\MtDec.obj \ $O\Ppmd7.obj \ $O\Ppmd7Dec.obj \ $O\Ppmd7Enc.obj \ @@ -287,3 +290,4 @@ C_OBJS = \ !include "../../Aes.mak" !include "../../Crc.mak" !include "../../Crc64.mak" +!include "../../LzmaDec.mak" diff --git a/CPP/7zip/Bundles/Format7zFO/Format7z.dsp b/CPP/7zip/Bundles/Format7zFO/Format7z.dsp index 94368826..39ff535b 100644 --- a/CPP/7zip/Bundles/Format7zFO/Format7z.dsp +++ b/CPP/7zip/Bundles/Format7zFO/Format7z.dsp @@ -961,6 +961,24 @@ SOURCE=..\..\Compress\HuffmanDecoder.h # End Source File # Begin Source File +SOURCE=..\..\Compress\LzfseDecoder.cpp + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\Compress\LzfseDecoder.h +# End Source File +# Begin Source File + SOURCE=..\..\Compress\LzhDecoder.cpp # End Source File # Begin Source File @@ -1787,6 +1805,26 @@ SOURCE=..\..\..\..\C\Lzma2Dec.h # End Source File # Begin Source File +SOURCE=..\..\..\..\C\Lzma2DecMt.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\Lzma2DecMt.h +# End Source File +# Begin Source File + SOURCE=..\..\..\..\C\Lzma2Enc.c !IF "$(CFG)" == "7z - Win32 Release" @@ -1856,6 +1894,26 @@ SOURCE=..\..\..\..\C\MtCoder.h # End Source File # Begin Source File +SOURCE=..\..\..\..\C\MtDec.c + +!IF "$(CFG)" == "7z - Win32 Release" + +# ADD CPP /O2 +# SUBTRACT CPP /YX /Yc /Yu + +!ELSEIF "$(CFG)" == "7z - Win32 Debug" + +# SUBTRACT CPP /YX /Yc /Yu + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\C\MtDec.h +# End Source File +# Begin Source File + SOURCE=..\..\..\..\C\Ppmd.h # End Source File # Begin Source File diff --git a/CPP/7zip/Bundles/Format7zFO/makefile b/CPP/7zip/Bundles/Format7zFO/makefile index 6a398984..3795c044 100644 --- a/CPP/7zip/Bundles/Format7zFO/makefile +++ b/CPP/7zip/Bundles/Format7zFO/makefile @@ -1,10 +1,10 @@ PROG = 7z.dll DEF_FILE = ../../Archive/Archive2.def CFLAGS = $(CFLAGS) \ - -DEXTERNAL_CODECS -DZSTD_LEGACY_SUPPORT -DNEED_7ZIP_GUID \ + -DEXTERNAL_CODECS -DNEED_7ZIP_GUID -DZSTD_LEGACY_SUPPORT \ !IFNDEF UNDER_CE -CFLAGS = $(CFLAGS) -D_7ZIP_LARGE_PAGES +CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID -D_7ZIP_LARGE_PAGES !ENDIF !include "Arc.mak" @@ -34,27 +34,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ LIZARD_OBJS = \ @@ -73,10 +75,12 @@ LZ5_OBJS = \ $O\lz5hc.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/Format7zUSB/makefile b/CPP/7zip/Bundles/Format7zUSB/makefile index a8bcd298..1519c837 100644 --- a/CPP/7zip/Bundles/Format7zUSB/makefile +++ b/CPP/7zip/Bundles/Format7zUSB/makefile @@ -53,6 +53,7 @@ AR_COMMON_OBJS = \ $O\OutStreamWithCRC.obj \ $O\ParseProperties.obj \ + 7Z_OBJS = \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ @@ -81,13 +82,13 @@ COMPRESS_OBJS = \ $O\BranchRegister.obj \ $O\ByteSwap.obj \ $O\BZip2Crc.obj \ - $O\BZip2Encoder.obj \ $O\BZip2Decoder.obj \ + $O\BZip2Encoder.obj \ $O\BZip2Register.obj \ $O\CopyCoder.obj \ $O\CopyRegister.obj \ - $O\DeflateEncoder.obj \ $O\DeflateDecoder.obj \ + $O\DeflateEncoder.obj \ $O\DeflateRegister.obj \ $O\DeltaFilter.obj \ $O\Lzma2Decoder.obj \ @@ -122,10 +123,12 @@ C_OBJS = \ $O\LzFind.obj \ $O\LzFindMt.obj \ $O\Lzma2Dec.obj \ + $O\Lzma2DecMt.obj \ $O\Lzma2Enc.obj \ $O\LzmaDec.obj \ $O\LzmaEnc.obj \ $O\MtCoder.obj \ + $O\MtDec.obj \ $O\Ppmd7.obj \ $O\Ppmd7Dec.obj \ $O\Ppmd7Enc.obj \ @@ -154,27 +157,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ BROTLI_OBJS = \ - $O/br_dictionary.obj \ - $O/br_bit_reader.obj \ - $O/br_decode.obj \ - $O/br_huffman.obj \ - $O/br_state.obj \ $O/br_backward_references.obj \ $O/br_backward_references_hq.obj \ $O/br_bit_cost.obj \ + $O/br_bit_reader.obj \ $O/br_block_splitter.obj \ $O/br_brotli_bit_stream.obj \ $O/br_cluster.obj \ $O/br_compress_fragment.obj \ $O/br_compress_fragment_two_pass.obj \ + $O/br_decode.obj \ + $O/br_dictionary.obj \ $O/br_dictionary_hash.obj \ $O/br_encode.obj \ + $O/br_encoder_dict.obj \ $O/br_entropy_encode.obj \ $O/br_histogram.obj \ + $O/br_huffman.obj \ $O/br_literal_cost.obj \ $O/br_memory.obj \ $O/br_metablock.obj \ + $O/br_state.obj \ $O/br_static_dict.obj \ + $O/br_transform.obj \ $O/br_utf8_util.obj \ LIZARD_OBJS = \ @@ -193,10 +198,12 @@ LZ5_OBJS = \ $O\lz5hc.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ $O\error_private.obj \ $O\fse_compress.obj \ $O\fse_decompress.obj \ + $O\hist.obj \ $O\huf_compress.obj \ $O\huf_decompress.obj \ $O\pool.obj \ diff --git a/CPP/7zip/Bundles/SFXCon/makefile b/CPP/7zip/Bundles/SFXCon/makefile index fdf0f5cf..a310c81c 100644 --- a/CPP/7zip/Bundles/SFXCon/makefile +++ b/CPP/7zip/Bundles/SFXCon/makefile @@ -137,17 +137,30 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ ZSTD_OBJS = \ + $O\debug.obj \ $O\entropy_common.obj \ - $O\fse_decompress.obj \ - $O\huf_decompress.obj \ - $O\zstd_common.obj \ - $O\zstd_decompress.obj \ - $O\xxhash.obj \ $O\error_private.obj \ + $O\fse_compress.obj \ + $O\fse_decompress.obj \ + $O\hist.obj \ + $O\huf_compress.obj \ + $O\huf_decompress.obj \ + $O\pool.obj \ + $O\threading.obj \ + $O\xxhash.obj \ + $O\zstd_common.obj \ + $O\zstd_compress.obj \ + $O\zstd_decompress.obj \ + $O\zstd_double_fast.obj \ + $O\zstd_fast.obj \ + $O\zstd_lazy.obj \ + $O\zstd_ldm.obj \ + $O\zstdmt_compress.obj \ + $O\zstd_opt.obj \ ZSTDMT_OBJS = \ - $O\threading.obj \ $O\zstd-mt_common.obj \ $O\zstd-mt_decompress.obj \ + $O\zstd-mt_threading.obj \ !include "../../7zip.mak" diff --git a/CPP/7zip/Bundles/SFXWin/makefile b/CPP/7zip/Bundles/SFXWin/makefile index ad64bbc5..38304c62 100644 --- a/CPP/7zip/Bundles/SFXWin/makefile +++ b/CPP/7zip/Bundles/SFXWin/makefile @@ -156,17 +156,30 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $O\ZstdRegister.obj \ ZSTD_OBJS = \ - $O\xxhash.obj \ + $O\debug.obj \ $O\entropy_common.obj \ - $O\fse_decompress.obj \ - $O\huf_decompress.obj \ - $O\zstd_common.obj \ - $O\zstd_decompress.obj \ $O\error_private.obj \ + $O\fse_compress.obj \ + $O\fse_decompress.obj \ + $O\hist.obj \ + $O\huf_compress.obj \ + $O\huf_decompress.obj \ + $O\pool.obj \ + $O\threading.obj \ + $O\xxhash.obj \ + $O\zstd_common.obj \ + $O\zstd_compress.obj \ + $O\zstd_decompress.obj \ + $O\zstd_double_fast.obj \ + $O\zstd_fast.obj \ + $O\zstd_lazy.obj \ + $O\zstd_ldm.obj \ + $O\zstdmt_compress.obj \ + $O\zstd_opt.obj \ ZSTDMT_OBJS = \ - $O\threading.obj \ $O\zstd-mt_common.obj \ $O\zstd-mt_decompress.obj \ + $O\zstd-mt_threading.obj \ !include "../../7zip.mak" diff --git a/CPP/appveyor.cmd b/CPP/appveyor.cmd index 793e5c09..4e0a015d 100644 --- a/CPP/appveyor.cmd +++ b/CPP/appveyor.cmd @@ -1,3 +1,4 @@ +@echo off REM Microsoft Windows SDK 7.1 (VC=sdk71) REM Microsoft Visual Studio 2012 (VC=11.0) @@ -6,13 +7,14 @@ REM Microsoft Visual Studio 2015 (VC=14.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 I am using sdk71 and 14.0 for releases... /TR +REM I am using sdk71 and 12.0 for releases... /TR :sdk71 set VC=sdk71 -set NEXT=vc14 +set NEXT=vc12 goto build_sdk :vc11 @@ -23,7 +25,7 @@ goto build :vc12 set VC=12.0 set CFLAGS=-Gw -set NEXT=vc14 +set NEXT=end goto build :vc14 @@ -60,5 +62,5 @@ goto %NEXT% :end cd %APPVEYOR_BUILD_FOLDER% set > env.txt -7z a %APPVEYOR_PROJECT_NAME%-%APPVEYOR_BUILD_VERSION%.7z bin-* env.txt +7z a %APPVEYOR_PROJECT_NAME%-%APPVEYOR_BUILD_VERSION%.7z bin-* *.txt diff --git a/CPP/build-ia64.cmd b/CPP/build-ia64.cmd index b194f76e..4bd741eb 100644 --- a/CPP/build-ia64.cmd +++ b/CPP/build-ia64.cmd @@ -1,87 +1,106 @@ -@echo on +@echo off set ROOT=%cd%\7zip if not defined OUTDIR set OUTDIR=%ROOT%\binIA64 mkdir %OUTDIR% -set OPTS=CPU=IA64 MY_STATIC_LINK=1 +set OPTS=CPU=IA64 MY_STATIC_LINK=1 /NOLOGO set LFLAGS=/SUBSYSTEM:WINDOWS,"5.02" cd %ROOT%\Bundles\Format7zExtract nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zxa.dll" >> %ERRFILE% copy IA64\7zxa.dll %OUTDIR%\7zxa.dll cd %ROOT%\Bundles\Format7z nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7za.dll" >> %ERRFILE% copy IA64\7za.dll %OUTDIR%\7za.dll cd %ROOT%\Bundles\Format7zF nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.dll" >> %ERRFILE% copy IA64\7z.dll %OUTDIR%\7z.dll cd %ROOT%\Bundles\Format7zFO nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zOrig.dll" >> %ERRFILE% copy IA64\7z.dll %OUTDIR%\7zOrig.dll cd %ROOT%\Bundles\Format7zUSB nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zUSB.dll" >> %ERRFILE% copy IA64\7zu.dll %OUTDIR%\7zu-x64.dll cd %ROOT%\UI\FileManager nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zFM.exe" >> %ERRFILE% copy IA64\7zFM.exe %OUTDIR%\7zFM.exe cd %ROOT%\UI\GUI nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zG.exe" >> %ERRFILE% copy IA64\7zG.exe %OUTDIR%\7zG.exe cd %ROOT%\UI\Explorer nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7-zip.dll" >> %ERRFILE% copy IA64\7-zip.dll %OUTDIR%\7-zip.dll cd %ROOT%\Bundles\SFXWin nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.sfx" >> %ERRFILE% copy IA64\7z.sfx %OUTDIR%\7z.sfx cd %ROOT%\Bundles\Codec_brotli nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ brotli-x64.dll" >> %ERRFILE% copy IA64\brotli.dll %OUTDIR%\brotli-x64.dll cd %ROOT%\Bundles\Codec_lizard nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ lizard-x64.dll" >> %ERRFILE% copy IA64\lizard.dll %OUTDIR%\lizard-x64.dll cd %ROOT%\Bundles\Codec_lz4 nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ lz4-x64.dll" >> %ERRFILE% copy IA64\lz4.dll %OUTDIR%\lz4-x64.dll cd %ROOT%\Bundles\Codec_lz5 nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ lz5-x64.dll" >> %ERRFILE% copy IA64\lz5.dll %OUTDIR%\lz5-x64.dll cd %ROOT%\Bundles\Codec_zstdF nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ zstd-x64.dll" >> %ERRFILE% copy IA64\zstd.dll %OUTDIR%\zstd-x64.dll cd %ROOT%\..\..\C\Util\7zipInstall nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ Install-x64.exe" >> %ERRFILE% copy IA64\7zipInstall.exe %OUTDIR%\Install-x64.exe cd %ROOT%\..\..\C\Util\7zipUninstall nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ Uninstall.exe" >> %ERRFILE% copy IA64\7zipUninstall.exe %OUTDIR%\Uninstall.exe set LFLAGS=/SUBSYSTEM:CONSOLE,"5.02" cd %ROOT%\UI\Console nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7z.exe" >> %ERRFILE% copy IA64\7z.exe %OUTDIR%\7z.exe cd %ROOT%\Bundles\SFXCon nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7zCon.sfx" >> %ERRFILE% copy IA64\7zCon.sfx %OUTDIR%\7zCon.sfx cd %ROOT%\Bundles\Alone nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error ia64 @ 7za.exe" >> %ERRFILE% copy IA64\7za.exe %OUTDIR%\7za.exe :ende diff --git a/CPP/build-x32.cmd b/CPP/build-x32.cmd index 77472954..c2fb6476 100644 --- a/CPP/build-x32.cmd +++ b/CPP/build-x32.cmd @@ -1,88 +1,108 @@ -@echo on +@echo off set ROOT=%cd%\7zip if not defined OUTDIR set OUTDIR=%ROOT%\bin32 mkdir %OUTDIR% -set OPTS=MY_STATIC_LINK=1 +set OPTS=MY_STATIC_LINK=1 /NOLOGO set LFLAGS=/SUBSYSTEM:WINDOWS,"5.01" 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%\Bundles\Format7zFO nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x32 @ 7zOrig.dll" >> %ERRFILE% copy O\7z.dll %OUTDIR%\7zOrig.dll cd %ROOT%\Bundles\Format7zUSB nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x32 @ 7zUSB.dll" >> %ERRFILE% copy O\7zu.dll %OUTDIR%\7zu-x32.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_zstdF nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x32 @ zstd-x32.dll" >> %ERRFILE% copy O\zstd.dll %OUTDIR%\zstd-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,"5.01" 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 index d4adcfc7..1ec02fac 100644 --- a/CPP/build-x64.cmd +++ b/CPP/build-x64.cmd @@ -1,87 +1,107 @@ -@echo on +@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 +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%\Bundles\Format7zFO nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zOrig.dll" >> %ERRFILE% copy AMD64\7z.dll %OUTDIR%\7zOrig.dll cd %ROOT%\Bundles\Format7zUSB nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ 7zUSB.dll" >> %ERRFILE% copy AMD64\7zu.dll %OUTDIR%\7zu-x64.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_zstdF nmake %OPTS% +IF %errorlevel% NEQ 0 echo "Error x64 @ zstd-x64.dll" >> %ERRFILE% copy AMD64\zstd.dll %OUTDIR%\zstd-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 diff --git a/README.md b/README.md index 6af0ac17..ebf9055d 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ You can install it in two ways: The output should look like this: ``` -7-Zip 17.01 ZS v1.3.6 R1 (x64) : Copyright (c) 1999-2017 Igor Pavlov +7-Zip 18.05 ZS v1.3.6 R1 (x64) : Copyright (c) 1999-2017 Igor Pavlov : 2018-10-21 Libs: @@ -139,7 +139,7 @@ Codecs: The output should look like this: ``` -7-Zip 17.01 beta (x64) : Copyright (c) 1999-2017 Igor Pavlov : 2017-08-28 +7-Zip 18.05 ZS v1.3.6 R1 (x64) : Copyright (c) 1999-2017 Igor Pavlov : 2018-10-21 Libs: