4.634.63

1 files changed, 32 insertions, 150 deletions

diff --git a/CPP/7zip/Bundles/Format7zF/makefile b/CPP/7zip/Bundles/Format7zF/makefile
index fb2a1f91..18a2d731 100755
--- a/CPP/7zip/Bundles/Format7zF/makefile
+++ b/CPP/7zip/Bundles/Format7zF/makefile
@@ -38,8 +38,6 @@ WIN_OBJS = \
   $O\FilterCoder.obj \
   $O\LimitedStreams.obj \
   $O\LockedStream.obj \
-  $O\LSBFDecoder.obj \
-  $O\LSBFEncoder.obj \
   $O\MethodId.obj \
   $O\MethodProps.obj \
   $O\MemBlocks.obj \
@@ -213,107 +211,64 @@ ZIP_OBJS = \
 
 COMPRESS_OBJS = \
   $O\CodecExports.obj \
-
-BRANCH_OPT_OBJS = \
-  $O\x86.obj \
-  $O\x86_2.obj \
+  $O\ArjDecoder1.obj \
+  $O\ArjDecoder2.obj \
+  $O\Bcj2Coder.obj \
+  $O\Bcj2Register.obj \
+  $O\BcjCoder.obj \
+  $O\BcjRegister.obj \
+  $O\BitlDecoder.obj \
   $O\BranchCoder.obj \
   $O\BranchMisc.obj \
   $O\BranchRegister.obj \
-  $O\BCJRegister.obj \
-  $O\BCJ2Register.obj \
-
-SWAP_OPT_OBJS = \
   $O\ByteSwap.obj \
   $O\ByteSwapRegister.obj \
-
-BZIP2_OBJS = \
-  $O\BZip2CRC.obj \
-  $O\BZip2Register.obj \
-
-BZIP2_OPT_OBJS = \
+  $O\BZip2Crc.obj \
   $O\BZip2Decoder.obj \
   $O\BZip2Encoder.obj \
-
-COPY_OBJS = \
+  $O\BZip2Register.obj \
   $O\CopyCoder.obj \
   $O\CopyRegister.obj \
-
-DEFLATE_OPT_OBJS = \
+  $O\Deflate64Register.obj \
   $O\DeflateDecoder.obj \
   $O\DeflateEncoder.obj \
-  $O\DeflateRegister.obj \
-  $O\Deflate64Register.obj \
   $O\DeflateNsisRegister.obj \
-  $O\ZlibDecoder.obj \
-
-IMPLODE_OBJS = \
+  $O\DeflateRegister.obj \
   $O\ImplodeDecoder.obj \
   $O\ImplodeHuffmanDecoder.obj \
-
-LZ_OBJS = \
-  $O\LZOutWindow.obj \
-
-LZMA_OPT_OBJS = \
-  $O\LZMADecoder.obj \
-  $O\LZMAEncoder.obj \
-  $O\LZMARegister.obj \
-
-LZX_OBJS = \
-  $O\LzxDecoder.obj \
+  $O\LzhDecoder.obj \
+  $O\LzmaDecoder.obj \
+  $O\LzmaEncoder.obj \
+  $O\LzmaRegister.obj \
+  $O\LzOutWindow.obj \
   $O\Lzx86Converter.obj \
-
-PPMD_OPT_OBJS = \
-  $O\PPMDDecoder.obj \
-  $O\PPMDEncoder.obj \
-  $O\PPMDRegister.obj \
-
-RAR29_OPT_OBJS = \
+  $O\LzxDecoder.obj \
+  $O\PpmdDecoder.obj \
+  $O\PpmdEncoder.obj \
+  $O\PpmdRegister.obj \
+  $O\QuantumDecoder.obj \
   $O\Rar1Decoder.obj \
   $O\Rar2Decoder.obj \
   $O\Rar3Decoder.obj \
   $O\Rar3Vm.obj \
   $O\RarCodecsRegister.obj \
-
-SHRINK_OBJS = \
   $O\ShrinkDecoder.obj \
-
-COMPRESS_ARJ_OBJS = \
-  $O\ArjDecoder1.obj \
-  $O\ArjDecoder2.obj \
-
-COMPRESS_LZH_OBJS = \
-  $O\LzhDecoder.obj \
-
-COMPRESS_Z_OBJS = \
+  $O\ZlibDecoder.obj \
   $O\ZDecoder.obj \
 
-7ZAES_OPT_OBJS = \
-  $O\7zAES.obj \
-  $O\7zAESRegister.obj \
-
-AES_OPT_OBJS = \
-  $O\MyAES.obj \
-
-CRYPTO_HASH_OBJS = \
+CRYPTO_OBJS = \
+  $O\7zAes.obj \
+  $O\7zAesRegister.obj \
   $O\HmacSha1.obj \
+  $O\MyAes.obj \
   $O\Pbkdf2HmacSha1.obj \
   $O\RandGen.obj \
+  $O\Rar20Crypto.obj \
+  $O\RarAes.obj \
   $O\Sha1.obj \
-
-CRYPTO_WZAES_OBJS = \
-  $O\WzAES.obj \
-
-CRYPTO_ZIP_OBJS = \
-  $O\ZipCipher.obj \
+  $O\WzAes.obj \
   $O\ZipCrypto.obj \
-
-CRYPTO_RAR20_OBJS = \
-  $O\Rar20Cipher.obj \
-  $O\Rar20Crypto.obj \
-
-CRYPTO_RARAES_OBJS = \
-  $O\RarAES.obj \
+  $O\ZipStrong.obj \
 
 
 C_OBJS = \
@@ -360,33 +315,9 @@ OBJS = \
   $(UDF_OBJS) \
   $(WIM_OBJS) \
   $(ZIP_OBJS) \
-  $(BZIP2_OBJS) \
-  $(BZIP2_OPT_OBJS) \
   $(COMPRESS_OBJS) \
-  $(BRANCH_OPT_OBJS) \
-  $(SWAP_OPT_OBJS) \
-  $(COPY_OBJS) \
-  $(DEFLATE_OPT_OBJS) \
-  $(IMPLODE_OBJS) \
-  $(LZ_OBJS) \
-  $(LZMA_OPT_OBJS) \
-  $(LZX_OBJS) \
-  $(PPMD_OPT_OBJS) \
-  $(RAR29_OPT_OBJS) \
-  $(SHRINK_OBJS) \
-  $(COMPRESS_ARJ_OBJS) \
-  $(COMPRESS_LZH_OBJS) \
-  $(COMPRESS_Z_OBJS) \
-  $O\QuantumDecoder.obj \
+  $(CRYPTO_OBJS) \
   $(C_OBJS) \
-  $O\RangeCoderBit.obj \
-  $(7ZAES_OPT_OBJS) \
-  $(AES_OPT_OBJS) \
-  $(CRYPTO_ZIP_OBJS) \
-  $(CRYPTO_WZAES_OBJS) \
-  $(CRYPTO_HASH_OBJS) \
-  $(CRYPTO_RAR20_OBJS) \
-  $(CRYPTO_RARAES_OBJS) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -442,59 +373,10 @@ $(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp
 	$(COMPL)
 
 $(COMPRESS_OBJS): ../../Compress/$(*B).cpp
-	$(COMPL)
-$(BRANCH_OPT_OBJS): ../../Compress/Branch/$(*B).cpp
-	$(COMPL_O2)
-$(SWAP_OPT_OBJS): ../../Compress/ByteSwap/$(*B).cpp
-	$(COMPL_O2)
-$(BZIP2_OBJS): ../../Compress/BZip2/$(*B).cpp
-	$(COMPL)
-$(BZIP2_OPT_OBJS): ../../Compress/BZip2/$(*B).cpp
-	$(COMPL_O2)
-$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
-	$(COMPL)
-$(DEFLATE_OPT_OBJS): ../../Compress/Deflate/$(*B).cpp
-	$(COMPL_O2)
-$(IMPLODE_OBJS): ../../Compress/Implode/$(*B).cpp
-	$(COMPL)
-$(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
-	$(COMPL)
-$(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
 	$(COMPL_O2)
-$(LZX_OBJS): ../../Compress/Lzx/$(*B).cpp
-	$(COMPL_O2)
-$(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
-	$(COMPL_O2)
-$(RAR29_OPT_OBJS): ../../Compress/Rar/$(*B).cpp
-	$(COMPL_O2)
-$(SHRINK_OBJS): ../../Compress/Shrink/$(*B).cpp
-	$(COMPL)
-$(COMPRESS_ARJ_OBJS): ../../Compress/Arj/$(*B).cpp
-	$(COMPL)
-$(COMPRESS_LZH_OBJS): ../../Compress/Lzh/$(*B).cpp
-	$(COMPL)
-$(COMPRESS_Z_OBJS): ../../Compress/Z/$(*B).cpp
-	$(COMPL)
-$O\QuantumDecoder.obj: ../../Compress/Quantum/$(*B).cpp
-	$(COMPL)
 
-$O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
-	$(COMPL)
-
-$(AES_OPT_OBJS): ../../Crypto/AES/$(*B).cpp
-	$(COMPL_O2)
-$(7ZAES_OPT_OBJS): ../../Crypto/7zAES/$(*B).cpp
-	$(COMPL_O2)
-$(CRYPTO_ZIP_OBJS): ../../Crypto/Zip/$(*B).cpp
-	$(COMPL)
-$(CRYPTO_WZAES_OBJS): ../../Crypto/WzAES/$(*B).cpp
-	$(COMPL_O2)
-$(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
+$(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
 	$(COMPL_O2)
-$(CRYPTO_RAR20_OBJS): ../../Crypto/Rar20/$(*B).cpp
-	$(COMPL)
-$(CRYPTO_RARAES_OBJS): ../../Crypto/RarAES/$(*B).cpp
-	$(COMPL)
 
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)