xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 01:15:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add some compiling fixes and choose compiler (vc12 + sdk71 for ia64)

Browse Source 
- 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
This commit is contained in:
Tino Reichardt
2018-10-21 14:46:06 +02:00
parent 78fc3c9bc5
commit c9b085e4ec
27 changed files with 269 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
C/brotli/Brotli-Adjust.sh
View File

@@ -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)

8
C/brotli/port.h
View File

@@ -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 <evan@nemerson.com> */

2
C/lz4/lz4frame.c
View File

@@ -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"
/*-************************************

2
CPP/7zip/Archive/LzHandler.cpp
View File

@@ -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,

14
CPP/7zip/Bundles/Alone/makefile
View File

@@ -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 \

12
CPP/7zip/Bundles/Codec_brotli/makefile
View File

@@ -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 = \

2
CPP/7zip/Bundles/Codec_brotli/resource.rc
View File

@@ -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"

8
CPP/7zip/Bundles/Codec_lizard/makefile
View File

@@ -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 \

2
CPP/7zip/Bundles/Codec_lz4/resource.rc
View File

@@ -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"

2
CPP/7zip/Bundles/Codec_zstd/makefile
View File

@@ -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 \

2
CPP/7zip/Bundles/Codec_zstd/resource.rc
View File

@@ -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"

2
CPP/7zip/Bundles/Codec_zstdF/makefile
View File

@@ -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 \

2
CPP/7zip/Bundles/Codec_zstdF/resource.rc
View File

@@ -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"

19
CPP/7zip/Bundles/Format7z/makefile
View File

@@ -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 \

16
CPP/7zip/Bundles/Format7zExtract/makefile
View File

@@ -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 \

14
CPP/7zip/Bundles/Format7zF/makefile
View File

@@ -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 \

4
CPP/7zip/Bundles/Format7zFO/Arc.mak
View File

@@ -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"

58
CPP/7zip/Bundles/Format7zFO/Format7z.dsp
View File

@@ -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

18
CPP/7zip/Bundles/Format7zFO/makefile
View File

@@ -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 \

21
CPP/7zip/Bundles/Format7zUSB/makefile
View File

@@ -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 \

25
CPP/7zip/Bundles/SFXCon/makefile
View File

@@ -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"

25
CPP/7zip/Bundles/SFXWin/makefile
View File

@@ -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"

10
CPP/appveyor.cmd
View File

@@ -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

23
CPP/build-ia64.cmd
View File

@@ -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

24
CPP/build-x32.cmd
View File

@@ -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%\..

24
CPP/build-x64.cmd
View File

@@ -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

4
README.md
View File

@@ -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: