xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 22:06:59 -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

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"