From f417eb8c43a5532e57f460eb95dd6fa87ccb5633 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Thu, 8 Jun 2017 22:17:01 +0200 Subject: [PATCH] Add Lizard and Brotli to the USB-Backup DLL Bundle file. Update README.md Update README.md --- CPP/7zip/Bundles/Format7zUSB/makefile | 42 ++++++++++++++++++++++++++- README.md | 8 ++--- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/CPP/7zip/Bundles/Format7zUSB/makefile b/CPP/7zip/Bundles/Format7zUSB/makefile index 230a53ce..32d2f3cb 100644 --- a/CPP/7zip/Bundles/Format7zUSB/makefile +++ b/CPP/7zip/Bundles/Format7zUSB/makefile @@ -53,7 +53,6 @@ AR_COMMON_OBJS = \ $O\OutStreamWithCRC.obj \ $O\ParseProperties.obj \ - 7Z_OBJS = \ $O\7zCompressionMode.obj \ $O\7zDecode.obj \ @@ -138,9 +137,15 @@ C_OBJS = \ !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 \ @@ -148,6 +153,35 @@ COMPRESS_OBJS = $(COMPRESS_OBJS) \ $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 \ @@ -172,6 +206,12 @@ ZSTD_OBJS = \ 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 \ diff --git a/README.md b/README.md index 1ac98e0a..7d876542 100644 --- a/README.md +++ b/README.md @@ -196,8 +196,8 @@ For the benchmarks I am using Windows 7 64bit on my Laptop which has the followi - the decompression benchmark is also done in RAM via: `7z t archiv.7z` - the tool for measuring the times is [wtime](https://github.com/mcmilk/wtime), together with some [scripts](https://github.com/mcmilk/7-Zip-Benchmarking) - the testfile is generated via [generate-mcorpus](https://github.com/mcmilk/7-Zip-Benchmarking/blob/master/generate-mcorpus) -![Compression Speed vs Ratio](https://mcmilk.de/projects/7-Zip-zstd/dl/compr.png "Compression Speed vs Ratio") -![Decompression Speed](https://mcmilk.de/projects/7-Zip-zstd/dl/decomp.png "Decompression Speed per Level") +![Compression Speed vs Ratio](https://mcmilk.de/projects/7-Zip-zstd/dl/compr-v120.png "Compression Speed vs Ratio") +![Decompression Speed](https://mcmilk.de/projects/7-Zip-zstd/dl/decomp-v120.png "Decompression Speed per Level") ## License and redistribution @@ -207,8 +207,8 @@ For the benchmarks I am using Windows 7 64bit on my Laptop which has the followi - [7-Zip Homepage](http://www.7-zip.org/) - [7-Zip ZStandard Homepage](https://mcmilk.de/projects/7-Zip-zstd/) -- Request for inclusion into the mainline 7-Zip: https://sourceforge.net/p/sevenzip/discussion/45797/thread/a7e4f3f3/ - - result, will not be included :( +- [Request for inclusion](https://sourceforge.net/p/sevenzip/discussion/45797/thread/a7e4f3f3/) into the mainline 7-Zip: + - result, will currently not included :( ## Donate If you find this project useful, you can...