4.45 beta

CPP/7zip/Bundles/Format7zExtractR/makefile

@@ -1,20 +1,12 @@
 PROG = 7zxr.dll
-DEF_FILE = ../../Archive/Archive.def
+DEF_FILE = ../../Archive/Archive2.def
 LIBS = $(LIBS) user32.lib oleaut32.lib
 CFLAGS = $(CFLAGS) -I ../../../ \
-  -DEXCLUDE_COM \
-  -DNO_REGISTRY \
   -DEXTRACT_ONLY \
-  -DFORMAT_7Z \
   -DCOMPRESS_MT \
-  -DCOMPRESS_BCJ_X86 \
-  -DCOMPRESS_BCJ2 \
-  -DCOMPRESS_COPY \
-  -DCOMPRESS_LZMA \
   -D_NO_CRYPTO
 
 COMMON_OBJS = \
-  $O\Alloc.obj \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
@@ -32,28 +24,33 @@ 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\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\ItemNameUtils.obj \
   $O\OutStreamWithCRC.obj \
   $O\ParseProperties.obj \
 
 
 7Z_OBJS = \
-  $O\DllExports.obj \
   $O\7zCompressionMode.obj \
   $O\7zDecode.obj \
   $O\7zExtract.obj \
@@ -61,21 +58,52 @@ AR_COMMON_OBJS = \
   $O\7zHandler.obj \
   $O\7zHeader.obj \
   $O\7zIn.obj \
-  $O\7zMethodID.obj \
   $O\7zProperties.obj \
+  $O\7zRegister.obj \
 
 
+COMPRESS_OBJS = \
+  $O\CodecExports.obj \
+
+SWAP_OPT_OBJS = \
+  $O\ByteSwap.obj \
+  $O\ByteSwapRegister.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 \
+
+COPY_OBJS = \
+  $O\CopyCoder.obj \
+  $O\CopyRegister.obj \
 
 LZ_OBJS = \
   $O\LZOutWindow.obj \
 
 LZMA_OPT_OBJS = \
   $O\LZMADecoder.obj \
+  $O\LZMARegister.obj \
 
+C_OBJS = \
+  $O\Alloc.obj \
+  $O\7zCrc.obj
+
+C_BRANCH_OBJS = \
+  $O\BranchARM.obj \
+  $O\BranchARMThumb.obj \
+  $O\BranchIA64.obj \
+  $O\BranchPPC.obj \
+  $O\BranchSPARC.obj \
+  $O\BranchX86.obj \
 
 OBJS = \
   $O\StdAfx.obj \
@@ -83,12 +111,17 @@ OBJS = \
   $(COMMON_OBJS) \
   $(WIN_OBJS) \
   $(7ZIP_COMMON_OBJS) \
+  $(AR_OBJS) \
   $(AR_COMMON_OBJS) \
   $(7Z_OBJS) \
+  $(COMPRESS_OBJS) \
   $(BRANCH_OPT_OBJS) \
+  $(SWAP_OPT_OBJS) \
+  $(COPY_OBJS) \
   $(LZ_OBJS) \
   $(LZMA_OPT_OBJS) \
-  $O\CopyCoder.obj \
+  $(C_OBJS) \
+  $(C_BRANCH_OBJS) \
   $O\resource.res
 
 
@@ -100,18 +133,28 @@ $(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)
+$(COPY_OBJS): ../../Compress/Copy/$(*B).cpp
+	$(COMPL)
 $(LZ_OBJS): ../../Compress/LZ/$(*B).cpp
 	$(COMPL)
 $(LZMA_OPT_OBJS): ../../Compress/LZMA/$(*B).cpp
 	$(COMPL_O2)
 
-$O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
-	$(COMPL)
+$(C_OBJS): ../../../../C/$(*B).c
+	$(COMPL_O2)
+$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
+	$(COMPL_O2)