4.45 beta

CPP/7zip/Bundles/Format7z/Format7z.dsw

@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "7z"=.\Format7z.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

CPP/7zip/Bundles/Format7z/makefile

@@ -1,25 +1,14 @@
 PROG = 7za.dll
-DEF_FILE = ../../Archive/Archive.def
+DEF_FILE = ../../Archive/Archive2.def
 LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
-  -DEXCLUDE_COM \
-  -DNO_REGISTRY \
-  -DFORMAT_7Z \
   -DCOMPRESS_MT \
-  -DCOMPRESS_BCJ_X86 \
-  -DCOMPRESS_BCJ2 \
-  -DCOMPRESS_BZIP2_DECODER \
-  -DCOMPRESS_BZIP2_MT \
-  -DCOMPRESS_COPY \
-  -DCOMPRESS_DEFLATE_DECODER \
-  -DCOMPRESS_LZMA \
   -DCOMPRESS_MF_MT \
-  -DCOMPRESS_PPMD \
-  -DCRYPTO_7ZAES \
-  -DCRYPTO_AES \
+  -DCOMPRESS_BZIP2_MT \
+  -DDEFLATE_EXTRACT_ONLY \
+  -DBZIP2_EXTRACT_ONLY \
 
 COMMON_OBJS = \
-  $O\Alloc.obj \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
@@ -37,22 +26,28 @@ WIN_OBJS = \
   $O\Synchronization.obj
 
 7ZIP_COMMON_OBJS = \
+  $O\CreateCoder.obj \
   $O\InBuffer.obj \
   $O\InOutTempBuffer.obj \
+  $O\FilterCoder.obj \
   $O\LimitedStreams.obj \
   $O\LockedStream.obj \
   $O\LSBFDecoder.obj \
+  $O\MethodId.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
 
+AR_OBJS = \
+  $O\ArchiveExports.obj \
+  $O\DllExports2.obj \
+
 AR_COMMON_OBJS = \
   $O\CoderMixer2.obj \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
-  $O\FilterCoder.obj \
   $O\InStreamWithCRC.obj \
   $O\ItemNameUtils.obj \
   $O\OutStreamWithCRC.obj \
@@ -60,7 +55,6 @@ AR_COMMON_OBJS = \
 
 
 7Z_OBJS = \
-  $O\DllExports.obj \
   $O\7zCompressionMode.obj \
   $O\7zDecode.obj \
   $O\7zEncode.obj \
@@ -71,26 +65,47 @@ AR_COMMON_OBJS = \
   $O\7zHandlerOut.obj \
   $O\7zHeader.obj \
   $O\7zIn.obj \
-  $O\7zMethodID.obj \
   $O\7zOut.obj \
   $O\7zProperties.obj \
   $O\7zSpecStream.obj \
   $O\7zUpdate.obj \
+  $O\7zRegister.obj \
 
 
+COMPRESS_OBJS = \
+  $O\CodecExports.obj \
+
 BRANCH_OPT_OBJS = \
   $O\BranchCoder.obj \
   $O\x86.obj \
   $O\x86_2.obj \
+  $O\ARM.obj \
+  $O\ARMThumb.obj \
+  $O\IA64.obj \
+  $O\PPC.obj \
+  $O\SPARC.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\BZip2Decoder.obj \
 
+COPY_OBJS = \
+  $O\CopyCoder.obj \
+  $O\CopyRegister.obj \
+
 DEFLATE_OPT_OBJS = \
   $O\DeflateDecoder.obj \
+  $O\DeflateRegister.obj \
 
 LZ_OBJS = \
   $O\LZOutWindow.obj \
@@ -98,14 +113,17 @@ LZ_OBJS = \
 LZMA_OPT_OBJS = \
   $O\LZMADecoder.obj \
   $O\LZMAEncoder.obj \
+  $O\LZMARegister.obj \
 
 PPMD_OPT_OBJS = \
   $O\PPMDDecoder.obj \
   $O\PPMDEncoder.obj \
+  $O\PPMDRegister.obj \
 
 
 7ZAES_OPT_OBJS = \
   $O\7zAES.obj \
+  $O\7zAESRegister.obj \
 
 AES_OPT_OBJS = \
   $O\MyAES.obj \
@@ -119,36 +137,51 @@ CRYPTO_HASH_OBJS = \
   $O\Sha256.obj \
 
 C_OBJS = \
-  $O\7zCrc.obj \
+  $O\Alloc.obj \
   $O\Threads.obj \
 
 C_LZ_OBJS = \
   $O\MatchFinder.obj \
   $O\MatchFinderMt.obj \
 
+C_BRANCH_OBJS = \
+  $O\BranchARM.obj \
+  $O\BranchARMThumb.obj \
+  $O\BranchIA64.obj \
+  $O\BranchPPC.obj \
+  $O\BranchSPARC.obj \
+  $O\BranchX86.obj \
+
+!include "../../Crc2.mak"
+
 OBJS = \
   $O\StdAfx.obj \
   $(CONSOLE_OBJS) \
   $(COMMON_OBJS) \
   $(WIN_OBJS) \
   $(7ZIP_COMMON_OBJS) \
+  $(AR_OBJS) \
   $(AR_COMMON_OBJS) \
   $(7Z_OBJS) \
+  $(COMPRESS_OBJS) \
+  $(BRANCH_OPT_OBJS) \
+  $(SWAP_OPT_OBJS) \
   $(BZIP2_OBJS) \
   $(BZIP2_OPT_OBJS) \
-  $(BRANCH_OPT_OBJS) \
+  $(COPY_OBJS) \
   $(DEFLATE_OPT_OBJS) \
   $(LZ_OBJS) \
   $(LZMA_OPT_OBJS) \
   $(PPMD_OPT_OBJS) \
   $(C_OBJS) \
   $(C_LZ_OBJS) \
-  $O\CopyCoder.obj \
+  $(C_BRANCH_OBJS) \
   $O\RangeCoderBit.obj \
   $(7ZAES_OPT_OBJS) \
   $(AES_OPT_OBJS) \
   $(AES_ORIG_OBJS) \
   $(CRYPTO_HASH_OBJS) \
+  $(CRC_OBJS) \
   $O\resource.res
 
 
@@ -160,18 +193,26 @@ $(WIN_OBJS): ../../../Windows/$(*B).cpp
 	$(COMPL)
 $(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
 	$(COMPL)
+$(AR_OBJS): ../../Archive/$(*B).cpp
+	$(COMPL)
 $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
 	$(COMPL)
 
 $(7Z_OBJS): ../../Archive/7z/$(*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)
 $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
@@ -181,8 +222,6 @@ $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
 $(PPMD_OPT_OBJS): ../../Compress/PPMD/$(*B).cpp
 	$(COMPL_O2)
 
-$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
-	$(COMPL)
 $O\RangeCoderBit.obj: ../../Compress/RangeCoder/$(*B).cpp
 	$(COMPL)
 
@@ -197,5 +236,9 @@ $(CRYPTO_HASH_OBJS): ../../Crypto/Hash/$(*B).cpp
 
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
+$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
+	$(COMPL_O2)
 $(C_LZ_OBJS): ../../../../C/Compress/Lz/$(*B).c
 	$(COMPL_O2)
+
+!include "../../Crc.mak"