Update Zstandard to v1.3.2

2025-12-08 12:07:03 -06:00 · 2017-10-31 10:04:10 +01:00
parent a818384b05
commit a42c9c1c77
68 changed files with 5978 additions and 3884 deletions
--- a/CPP/7zip/Bundles/Alone/makefile
+++ b/CPP/7zip/Bundles/Alone/makefile
@@ -275,16 +275,24 @@ LZ5_OBJS = \
  $O\lz5hc.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
  $O\error_private.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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 \
  $O\zstd_v01.obj \
  $O\zstd_v02.obj \
  $O\zstd_v03.obj \
@@ -292,11 +300,8 @@ ZSTD_OBJS = \
  $O\zstd_v05.obj \
  $O\zstd_v06.obj \
  $O\zstd_v07.obj \
-  $O\zstdmt_compress.obj \
-  $O\pool.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\brotli-mt_common.obj \
  $O\brotli-mt_compress.obj \
  $O\brotli-mt_decompress.obj \
@@ -312,6 +317,7 @@ ZSTDMT_OBJS = \
  $O\zstd-mt_common.obj \
  $O\zstd-mt_compress.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../UI/Console/Console.mak"

--- a/CPP/7zip/Bundles/Codec_brotli/makefile
+++ b/CPP/7zip/Bundles/Codec_brotli/makefile
@@ -1,54 +1,54 @@
-PROG = brotli.dll
-DEF_FILE = ../../Compress/Codec.def
-CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
-
-7ZIP_COMMON_OBJS = \
-  $O\StreamUtils.obj \
-
-WIN_OBJS = \
-  $O\System.obj \
-
-COMPRESS_OBJS = \
-  $O\CodecExports.obj \
-  $O\DllExportsCompress.obj \
-
-C_OBJS = \
-  $O\Alloc.obj \
-  $O\Threads.obj \
-
-COMPRESS_OBJS = $(COMPRESS_OBJS) \
-  $O\BrotliDecoder.obj \
-  $O\BrotliEncoder.obj \
-  $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_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_dictionary_hash.obj \
-  $O/br_encode.obj \
-  $O/br_entropy_encode.obj \
-  $O/br_histogram.obj \
-  $O/br_literal_cost.obj \
-  $O/br_memory.obj \
-  $O/br_metablock.obj \
-  $O/br_static_dict.obj \
-  $O/br_utf8_util.obj \
-
-ZSTDMT_OBJS = \
-  $O\threading.obj \
-  $O\brotli-mt_common.obj \
-  $O\brotli-mt_compress.obj \
-  $O\brotli-mt_decompress.obj \
-
-!include "../../7zip.mak"
+PROG = brotli.dll
+DEF_FILE = ../../Compress/Codec.def
+CFLAGS = $(CFLAGS) -DNEED_7ZIP_GUID
+
+7ZIP_COMMON_OBJS = \
+  $O\StreamUtils.obj \
+
+WIN_OBJS = \
+  $O\System.obj \
+
+COMPRESS_OBJS = \
+  $O\CodecExports.obj \
+  $O\DllExportsCompress.obj \
+
+C_OBJS = \
+  $O\Alloc.obj \
+  $O\Threads.obj \
+
+COMPRESS_OBJS = $(COMPRESS_OBJS) \
+  $O\BrotliDecoder.obj \
+  $O\BrotliEncoder.obj \
+  $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_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_dictionary_hash.obj \
+  $O/br_encode.obj \
+  $O/br_entropy_encode.obj \
+  $O/br_histogram.obj \
+  $O/br_literal_cost.obj \
+  $O/br_memory.obj \
+  $O/br_metablock.obj \
+  $O/br_static_dict.obj \
+  $O/br_utf8_util.obj \
+
+ZSTDMT_OBJS = \
+  $O\brotli-mt_common.obj \
+  $O\brotli-mt_compress.obj \
+  $O\brotli-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \
+
+!include "../../7zip.mak"
--- 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 v0.6.0", "Brotli")
+MY_VERSION_INFO_DLL("7-Zip Brotli Plugin v1.0.1", "Brotli")

 101  ICON  "../../Archive/Icons/7z.ico"
--- a/CPP/7zip/Bundles/Codec_lizard/makefile
+++ b/CPP/7zip/Bundles/Codec_lizard/makefile
@@ -36,9 +36,9 @@ ZSTD_OBJS = \
  $O\error_private.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\lizard-mt_common.obj \
  $O\lizard-mt_compress.obj \
  $O\lizard-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- a/CPP/7zip/Bundles/Codec_lz4/makefile
+++ b/CPP/7zip/Bundles/Codec_lz4/makefile
@@ -30,9 +30,9 @@ ZSTD_OBJS = \
  $O\xxhash.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\lz4-mt_common.obj \
  $O\lz4-mt_compress.obj \
  $O\lz4-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- 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.7.5", "Lz4")
+MY_VERSION_INFO_DLL("7-Zip LZ4 Plugin v1.8.0", "Lz4")

-101  ICON  "../../Archive/Icons/lz5.ico"
+101  ICON  "../../Archive/Icons/lz4.ico"
--- a/CPP/7zip/Bundles/Codec_lz5/makefile
+++ b/CPP/7zip/Bundles/Codec_lz5/makefile
@@ -30,9 +30,9 @@ ZSTD_OBJS = \
  $O\xxhash.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\lz5-mt_common.obj \
  $O\lz5-mt_compress.obj \
  $O\lz5-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- a/CPP/7zip/Bundles/Codec_zstd/makefile
+++ b/CPP/7zip/Bundles/Codec_zstd/makefile
@@ -22,23 +22,29 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \
  $O\ZstdRegister.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
-  $O\zstdmt_compress.obj \
-  $O\pool.obj \
  $O\error_private.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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_compress.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- 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.2.0", "zstd")
+MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.2", "zstd")

 101  ICON  "../../Archive/Icons/zst.ico"
--- a/CPP/7zip/Bundles/Codec_zstdF/makefile
+++ b/CPP/7zip/Bundles/Codec_zstdF/makefile
@@ -22,18 +22,24 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \
  $O\ZstdRegister.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
-  $O\zstdmt_compress.obj \
-  $O\pool.obj \
  $O\error_private.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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 \
  $O\zstd_v01.obj \
  $O\zstd_v02.obj \
  $O\zstd_v03.obj \
@@ -43,9 +49,9 @@ ZSTD_OBJS = \
  $O\zstd_v07.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\zstd-mt_common.obj \
  $O\zstd-mt_compress.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- 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.2.0", "zstd")
+MY_VERSION_INFO_DLL("7-Zip Zstandard Plugin v1.3.2", "zstd")

 101  ICON  "../../Archive/Icons/zst.ico"
--- a/CPP/7zip/Bundles/Format7z/makefile
+++ b/CPP/7zip/Bundles/Format7z/makefile
@@ -1,227 +1,240 @@
-PROG = 7za.dll
-DEF_FILE = ../../Archive/Archive2.def
-CFLAGS = $(CFLAGS)
-
-COMMON_OBJS = \
-  $O\CRC.obj \
-  $O\CrcReg.obj \
-  $O\IntToString.obj \
-  $O\NewHandler.obj \
-  $O\MyString.obj \
-  $O\Sha256Reg.obj \
-  $O\StringConvert.obj \
-  $O\StringToInt.obj \
-  $O\MyVector.obj \
-  $O\Wildcard.obj \
-
-WIN_OBJS = \
-  $O\FileDir.obj \
-  $O\FileFind.obj \
-  $O\FileIO.obj \
-  $O\FileName.obj \
-  $O\PropVariant.obj \
-  $O\Synchronization.obj \
-  $O\System.obj \
-
-7ZIP_COMMON_OBJS = \
-  $O\CreateCoder.obj \
-  $O\CWrappers.obj \
-  $O\InBuffer.obj \
-  $O\InOutTempBuffer.obj \
-  $O\FilterCoder.obj \
-  $O\LimitedStreams.obj \
-  $O\MethodId.obj \
-  $O\MethodProps.obj \
-  $O\OutBuffer.obj \
-  $O\ProgressUtils.obj \
-  $O\PropId.obj \
-  $O\StreamBinder.obj \
-  $O\StreamObjects.obj \
-  $O\StreamUtils.obj \
-  $O\UniqBlocks.obj \
-  $O\VirtThread.obj \
-
-AR_OBJS = \
-  $O\ArchiveExports.obj \
-  $O\DllExports2.obj \
-
-AR_COMMON_OBJS = \
-  $O\CoderMixer2.obj \
-  $O\HandlerOut.obj \
-  $O\InStreamWithCRC.obj \
-  $O\ItemNameUtils.obj \
-  $O\OutStreamWithCRC.obj \
-  $O\ParseProperties.obj \
-
-7Z_OBJS = \
-  $O\7zCompressionMode.obj \
-  $O\7zDecode.obj \
-  $O\7zEncode.obj \
-  $O\7zExtract.obj \
-  $O\7zFolderInStream.obj \
-  $O\7zHandler.obj \
-  $O\7zHandlerOut.obj \
-  $O\7zHeader.obj \
-  $O\7zIn.obj \
-  $O\7zOut.obj \
-  $O\7zProperties.obj \
-  $O\7zSpecStream.obj \
-  $O\7zUpdate.obj \
-  $O\7zRegister.obj \
-
-
-COMPRESS_OBJS = \
-  $O\CodecExports.obj \
-  $O\Bcj2Coder.obj \
-  $O\Bcj2Register.obj \
-  $O\BcjCoder.obj \
-  $O\BcjRegister.obj \
-  $O\BitlDecoder.obj \
-  $O\BranchMisc.obj \
-  $O\BranchRegister.obj \
-  $O\ByteSwap.obj \
-  $O\BZip2Crc.obj \
-  $O\BZip2Encoder.obj \
-  $O\BZip2Decoder.obj \
-  $O\BZip2Register.obj \
-  $O\CopyCoder.obj \
-  $O\CopyRegister.obj \
-  $O\DeflateEncoder.obj \
-  $O\DeflateDecoder.obj \
-  $O\DeflateRegister.obj \
-  $O\DeltaFilter.obj \
-  $O\Lzma2Decoder.obj \
-  $O\Lzma2Encoder.obj \
-  $O\Lzma2Register.obj \
-  $O\LzmaDecoder.obj \
-  $O\LzmaEncoder.obj \
-  $O\LzmaRegister.obj \
-  $O\LzOutWindow.obj \
-  $O\PpmdDecoder.obj \
-  $O\PpmdEncoder.obj \
-  $O\PpmdRegister.obj \
-
-CRYPTO_OBJS = \
-  $O\7zAes.obj \
-  $O\7zAesRegister.obj \
-  $O\MyAes.obj \
-  $O\MyAesReg.obj \
-  $O\RandGen.obj \
-
-C_OBJS = \
-  $O\Alloc.obj \
-  $O\Bcj2.obj \
-  $O\Bcj2Enc.obj \
-  $O\Bra.obj \
-  $O\Bra86.obj \
-  $O\BraIA64.obj \
-  $O\BwtSort.obj \
-  $O\CpuArch.obj \
-  $O\Delta.obj \
-  $O\HuffEnc.obj \
-  $O\LzFind.obj \
-  $O\LzFindMt.obj \
-  $O\Lzma2Dec.obj \
-  $O\Lzma2Enc.obj \
-  $O\LzmaDec.obj \
-  $O\LzmaEnc.obj \
-  $O\MtCoder.obj \
-  $O\Ppmd7.obj \
-  $O\Ppmd7Dec.obj \
-  $O\Ppmd7Enc.obj \
-  $O\Sha256.obj \
-  $O\Sort.obj \
-  $O\Threads.obj \
-
-!include "../../Aes.mak"
-!include "../../Crc.mak"
-
-COMPRESS_OBJS = $(COMPRESS_OBJS) \
-  $O\BrotliDecoder.obj \
-  $O\BrotliEncoder.obj \
-  $O\BrotliRegister.obj \
-  $O\Lz4Decoder.obj \
-  $O\Lz4Encoder.obj \
-  $O\Lz4Register.obj \
-  $O\LizardDecoder.obj \
-  $O\LizardEncoder.obj \
-  $O\LizardRegister.obj \
-  $O\Lz5Decoder.obj \
-  $O\Lz5Encoder.obj \
-  $O\Lz5Register.obj \
-  $O\ZstdDecoder.obj \
-  $O\ZstdEncoder.obj \
-  $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_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_dictionary_hash.obj \
-  $O/br_encode.obj \
-  $O/br_entropy_encode.obj \
-  $O/br_histogram.obj \
-  $O/br_literal_cost.obj \
-  $O/br_memory.obj \
-  $O/br_metablock.obj \
-  $O/br_static_dict.obj \
-  $O/br_utf8_util.obj \
-
-LIZARD_OBJS = \
-  $O/lizard_compress.obj \
-  $O/lizard_decompress.obj \
-  $O/lizard_frame.obj \
-
-LZ4_OBJS = \
-  $O\lz4.obj \
-  $O\lz4frame.obj \
-  $O\lz4hc.obj \
-
-LZ5_OBJS = \
-  $O\lz5.obj \
-  $O\lz5frame.obj \
-  $O\lz5hc.obj \
-
-ZSTD_OBJS = \
-  $O\xxhash.obj \
-  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
-  $O\error_private.obj \
-  $O\zstdmt_compress.obj \
-  $O\pool.obj \
-
-ZSTDMT_OBJS = \
-  $O\threading.obj \
-  $O\brotli-mt_common.obj \
-  $O\brotli-mt_compress.obj \
-  $O\brotli-mt_decompress.obj \
-  $O\lizard-mt_common.obj \
-  $O\lizard-mt_compress.obj \
-  $O\lizard-mt_decompress.obj \
-  $O\lz4-mt_common.obj \
-  $O\lz4-mt_compress.obj \
-  $O\lz4-mt_decompress.obj \
-  $O\lz5-mt_common.obj \
-  $O\lz5-mt_compress.obj \
-  $O\lz5-mt_decompress.obj \
-  $O\zstd-mt_common.obj \
-  $O\zstd-mt_compress.obj \
-  $O\zstd-mt_decompress.obj \
-
-!include "../../7zip.mak"
+PROG = 7za.dll
+DEF_FILE = ../../Archive/Archive2.def
+CFLAGS = $(CFLAGS)
+
+COMMON_OBJS = \
+  $O\CRC.obj \
+  $O\CrcReg.obj \
+  $O\IntToString.obj \
+  $O\NewHandler.obj \
+  $O\MyString.obj \
+  $O\Sha256Reg.obj \
+  $O\StringConvert.obj \
+  $O\StringToInt.obj \
+  $O\MyVector.obj \
+  $O\Wildcard.obj \
+
+WIN_OBJS = \
+  $O\FileDir.obj \
+  $O\FileFind.obj \
+  $O\FileIO.obj \
+  $O\FileName.obj \
+  $O\PropVariant.obj \
+  $O\Synchronization.obj \
+  $O\System.obj \
+
+7ZIP_COMMON_OBJS = \
+  $O\CreateCoder.obj \
+  $O\CWrappers.obj \
+  $O\InBuffer.obj \
+  $O\InOutTempBuffer.obj \
+  $O\FilterCoder.obj \
+  $O\LimitedStreams.obj \
+  $O\MethodId.obj \
+  $O\MethodProps.obj \
+  $O\OutBuffer.obj \
+  $O\ProgressUtils.obj \
+  $O\PropId.obj \
+  $O\StreamBinder.obj \
+  $O\StreamObjects.obj \
+  $O\StreamUtils.obj \
+  $O\UniqBlocks.obj \
+  $O\VirtThread.obj \
+
+AR_OBJS = \
+  $O\ArchiveExports.obj \
+  $O\DllExports2.obj \
+
+AR_COMMON_OBJS = \
+  $O\CoderMixer2.obj \
+  $O\HandlerOut.obj \
+  $O\InStreamWithCRC.obj \
+  $O\ItemNameUtils.obj \
+  $O\OutStreamWithCRC.obj \
+  $O\ParseProperties.obj \
+
+7Z_OBJS = \
+  $O\7zCompressionMode.obj \
+  $O\7zDecode.obj \
+  $O\7zEncode.obj \
+  $O\7zExtract.obj \
+  $O\7zFolderInStream.obj \
+  $O\7zHandler.obj \
+  $O\7zHandlerOut.obj \
+  $O\7zHeader.obj \
+  $O\7zIn.obj \
+  $O\7zOut.obj \
+  $O\7zProperties.obj \
+  $O\7zSpecStream.obj \
+  $O\7zUpdate.obj \
+  $O\7zRegister.obj \
+
+
+COMPRESS_OBJS = \
+  $O\CodecExports.obj \
+  $O\Bcj2Coder.obj \
+  $O\Bcj2Register.obj \
+  $O\BcjCoder.obj \
+  $O\BcjRegister.obj \
+  $O\BitlDecoder.obj \
+  $O\BranchMisc.obj \
+  $O\BranchRegister.obj \
+  $O\ByteSwap.obj \
+  $O\BZip2Crc.obj \
+  $O\BZip2Encoder.obj \
+  $O\BZip2Decoder.obj \
+  $O\BZip2Register.obj \
+  $O\CopyCoder.obj \
+  $O\CopyRegister.obj \
+  $O\DeflateEncoder.obj \
+  $O\DeflateDecoder.obj \
+  $O\DeflateRegister.obj \
+  $O\DeltaFilter.obj \
+  $O\Lzma2Decoder.obj \
+  $O\Lzma2Encoder.obj \
+  $O\Lzma2Register.obj \
+  $O\LzmaDecoder.obj \
+  $O\LzmaEncoder.obj \
+  $O\LzmaRegister.obj \
+  $O\LzOutWindow.obj \
+  $O\PpmdDecoder.obj \
+  $O\PpmdEncoder.obj \
+  $O\PpmdRegister.obj \
+
+CRYPTO_OBJS = \
+  $O\7zAes.obj \
+  $O\7zAesRegister.obj \
+  $O\MyAes.obj \
+  $O\MyAesReg.obj \
+  $O\RandGen.obj \
+
+C_OBJS = \
+  $O\Alloc.obj \
+  $O\Bcj2.obj \
+  $O\Bcj2Enc.obj \
+  $O\Bra.obj \
+  $O\Bra86.obj \
+  $O\BraIA64.obj \
+  $O\BwtSort.obj \
+  $O\CpuArch.obj \
+  $O\Delta.obj \
+  $O\HuffEnc.obj \
+  $O\LzFind.obj \
+  $O\LzFindMt.obj \
+  $O\Lzma2Dec.obj \
+  $O\Lzma2Enc.obj \
+  $O\LzmaDec.obj \
+  $O\LzmaEnc.obj \
+  $O\MtCoder.obj \
+  $O\Ppmd7.obj \
+  $O\Ppmd7Dec.obj \
+  $O\Ppmd7Enc.obj \
+  $O\Sha256.obj \
+  $O\Sort.obj \
+  $O\Threads.obj \
+
+!include "../../Aes.mak"
+!include "../../Crc.mak"
+
+COMPRESS_OBJS = $(COMPRESS_OBJS) \
+  $O\BrotliDecoder.obj \
+  $O\BrotliEncoder.obj \
+  $O\BrotliRegister.obj \
+  $O\Lz4Decoder.obj \
+  $O\Lz4Encoder.obj \
+  $O\Lz4Register.obj \
+  $O\LizardDecoder.obj \
+  $O\LizardEncoder.obj \
+  $O\LizardRegister.obj \
+  $O\Lz5Decoder.obj \
+  $O\Lz5Encoder.obj \
+  $O\Lz5Register.obj \
+  $O\ZstdDecoder.obj \
+  $O\ZstdEncoder.obj \
+  $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_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_dictionary_hash.obj \
+  $O/br_encode.obj \
+  $O/br_entropy_encode.obj \
+  $O/br_histogram.obj \
+  $O/br_literal_cost.obj \
+  $O/br_memory.obj \
+  $O/br_metablock.obj \
+  $O/br_static_dict.obj \
+  $O/br_utf8_util.obj \
+
+LIZARD_OBJS = \
+  $O/lizard_compress.obj \
+  $O/lizard_decompress.obj \
+  $O/lizard_frame.obj \
+
+LZ4_OBJS = \
+  $O\lz4.obj \
+  $O\lz4frame.obj \
+  $O\lz4hc.obj \
+
+LZ5_OBJS = \
+  $O\lz5.obj \
+  $O\lz5frame.obj \
+  $O\lz5hc.obj \
+
+ZSTD_OBJS = \
+  $O\entropy_common.obj \
+  $O\error_private.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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 \
+  $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\brotli-mt_common.obj \
+  $O\brotli-mt_compress.obj \
+  $O\brotli-mt_decompress.obj \
+  $O\lizard-mt_common.obj \
+  $O\lizard-mt_compress.obj \
+  $O\lizard-mt_decompress.obj \
+  $O\lz4-mt_common.obj \
+  $O\lz4-mt_compress.obj \
+  $O\lz4-mt_decompress.obj \
+  $O\lz5-mt_common.obj \
+  $O\lz5-mt_compress.obj \
+  $O\lz5-mt_decompress.obj \
+  $O\zstd-mt_common.obj \
+  $O\zstd-mt_compress.obj \
+  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \
+
+!include "../../7zip.mak"
--- a/CPP/7zip/Bundles/Format7zExtract/makefile
+++ b/CPP/7zip/Bundles/Format7zExtract/makefile
@@ -157,21 +157,33 @@ LZ5_OBJS = \
  $O\lz5hc.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
  $O\error_private.obj \
-  $O\zstdmt_compress.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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 \
+  $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\threading.obj \
  $O\brotli-mt_common.obj \
  $O\brotli-mt_decompress.obj \
  $O\lizard-mt_common.obj \
@@ -182,6 +194,7 @@ ZSTDMT_OBJS = \
  $O\lz5-mt_decompress.obj \
  $O\zstd-mt_common.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../Aes.mak"
 !include "../../Crc.mak"
--- a/CPP/7zip/Bundles/Format7zF/makefile
+++ b/CPP/7zip/Bundles/Format7zF/makefile
@@ -73,18 +73,24 @@ LZ5_OBJS = \
  $O\lz5hc.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
  $O\error_private.obj \
-  $O\zstdmt_compress.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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 \
  $O\zstd_v01.obj \
  $O\zstd_v02.obj \
  $O\zstd_v03.obj \
@@ -94,7 +100,6 @@ ZSTD_OBJS = \
  $O\zstd_v07.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\brotli-mt_common.obj \
  $O\brotli-mt_compress.obj \
  $O\brotli-mt_decompress.obj \
@@ -110,5 +115,6 @@ ZSTDMT_OBJS = \
  $O\zstd-mt_common.obj \
  $O\zstd-mt_compress.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- a/CPP/7zip/Bundles/Format7zFO/makefile
+++ b/CPP/7zip/Bundles/Format7zFO/makefile
@@ -73,18 +73,24 @@ LZ5_OBJS = \
  $O\lz5hc.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
  $O\error_private.obj \
-  $O\zstdmt_compress.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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 \
  $O\zstd_v01.obj \
  $O\zstd_v02.obj \
  $O\zstd_v03.obj \
@@ -94,7 +100,6 @@ ZSTD_OBJS = \
  $O\zstd_v07.obj \

 ZSTDMT_OBJS = \
-  $O\threading.obj \
  $O\brotli-mt_common.obj \
  $O\brotli-mt_compress.obj \
  $O\brotli-mt_decompress.obj \
@@ -110,5 +115,6 @@ ZSTDMT_OBJS = \
  $O\zstd-mt_common.obj \
  $O\zstd-mt_compress.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"
--- a/CPP/7zip/Bundles/Format7zUSB/makefile
+++ b/CPP/7zip/Bundles/Format7zUSB/makefile
@@ -193,21 +193,26 @@ LZ5_OBJS = \
  $O\lz5hc.obj \

 ZSTD_OBJS = \
-  $O\xxhash.obj \
  $O\entropy_common.obj \
-  $O\fse_decompress.obj \
-  $O\huf_decompress.obj \
-  $O\zstd_common.obj \
-  $O\zstd_decompress.obj \
-  $O\fse_compress.obj \
-  $O\huf_compress.obj \
-  $O\zstd_compress.obj \
-  $O\zstdmt_compress.obj \
-  $O\pool.obj \
  $O\error_private.obj \
+  $O\fse_compress.obj \
+  $O\fse_decompress.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\brotli-mt_common.obj \
  $O\brotli-mt_compress.obj \
  $O\brotli-mt_decompress.obj \
@@ -223,5 +228,6 @@ ZSTDMT_OBJS = \
  $O\zstd-mt_common.obj \
  $O\zstd-mt_compress.obj \
  $O\zstd-mt_decompress.obj \
+  $O\zstd-mt_threading.obj \

 !include "../../7zip.mak"