9.04 beta

CPP/7zip/Bundles/Alone/makefile

@@ -8,6 +8,7 @@ CFLAGS = $(CFLAGS) -I ../../../  \
   -D_7ZIP_LARGE_PAGES \
   -DBREAK_HANDLER \
   -DBENCH_MT \
+  -DSUPPORT_DEVICE_FILE \
 
 CONSOLE_OBJS = \
   $O\ConsoleClose.obj \
@@ -51,6 +52,7 @@ WIN_OBJS = \
 
 7ZIP_COMMON_OBJS = \
   $O\CreateCoder.obj \
+  $O\CWrappers.obj \
   $O\FilePathAutoRename.obj \
   $O\FileStreams.obj \
   $O\FilterCoder.obj \
@@ -93,6 +95,11 @@ UI_COMMON_OBJS = \
   $O\WorkDir.obj \
 
 AR_OBJS = \
+  $O\Bz2Handler.obj \
+  $O\GzHandler.obj \
+  $O\LzmaHandler.obj \
+  $O\SplitHandler.obj \
+  $O\XzHandler.obj \
   $O\ZHandler.obj \
 
 AR_COMMON_OBJS = \
@@ -126,12 +133,6 @@ AR_COMMON_OBJS = \
   $O\7zUpdate.obj \
   $O\7zRegister.obj \
 
-BZ2_OBJS = \
-  $O\BZip2Handler.obj \
-  $O\BZip2HandlerOut.obj \
-  $O\BZip2Update.obj \
-  $O\bz2Register.obj \
-
 CAB_OBJS = \
   $O\CabBlockInStream.obj \
   $O\CabHandler.obj \
@@ -139,26 +140,6 @@ CAB_OBJS = \
   $O\CabIn.obj \
   $O\CabRegister.obj \
 
-GZ_OBJS = \
-  $O\GZipHandler.obj \
-  $O\GZipHandlerOut.obj \
-  $O\GZipHeader.obj \
-  $O\GZipIn.obj \
-  $O\GZipOut.obj \
-  $O\GZipUpdate.obj \
-  $O\GZipRegister.obj \
-
-LZM_OBJS = \
-  $O\LzmaArcRegister.obj \
-  $O\LzmaFiltersDecode.obj \
-  $O\LzmaHandler.obj \
-  $O\LzmaIn.obj \
-
-SPLIT_OBJS = \
-  $O\SplitHandler.obj \
-  $O\SplitHandlerOut.obj \
-  $O\SplitRegister.obj \
-
 TAR_OBJS = \
   $O\TarHandler.obj \
   $O\TarHandlerOut.obj \
@@ -190,7 +171,6 @@ COMPRESS_OBJS = \
   $O\BranchMisc.obj \
   $O\BranchRegister.obj \
   $O\ByteSwap.obj \
-  $O\ByteSwapRegister.obj \
   $O\BZip2CRC.obj \
   $O\BZip2Decoder.obj \
   $O\BZip2Encoder.obj \
@@ -201,8 +181,12 @@ COMPRESS_OBJS = \
   $O\DeflateDecoder.obj \
   $O\DeflateEncoder.obj \
   $O\DeflateRegister.obj \
+  $O\DeltaFilter.obj \
   $O\ImplodeDecoder.obj \
   $O\ImplodeHuffmanDecoder.obj \
+  $O\Lzma2Decoder.obj \
+  $O\Lzma2Encoder.obj \
+  $O\Lzma2Register.obj \
   $O\LzmaDecoder.obj \
   $O\LzmaEncoder.obj \
   $O\LzmaRegister.obj \
@@ -233,20 +217,30 @@ CRYPTO_OBJS = \
   $O\ZipStrong.obj \
 
 C_OBJS = \
+  $O\7zStream.obj \
+  $O\Aes.obj \
   $O\Alloc.obj \
   $O\Bra.obj \
   $O\Bra86.obj \
   $O\BraIA64.obj \
   $O\BwtSort.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\Sha256.obj \
   $O\Sort.obj \
   $O\Threads.obj \
-  $O\Aes.obj \
-  $O\Sha256.obj \
+  $O\Xz.obj \
+  $O\XzCrc64.obj \
+  $O\XzDec.obj \
+  $O\XzEnc.obj \
+  $O\XzIn.obj \
 
 !include "../../Crc2.mak"
 
@@ -261,11 +255,7 @@ OBJS = \
   $(AR_OBJS) \
   $(AR_COMMON_OBJS) \
   $(7Z_OBJS) \
-  $(BZ2_OBJS) \
   $(CAB_OBJS) \
-  $(GZ_OBJS) \
-  $(LZM_OBJS) \
-  $(SPLIT_OBJS) \
   $(TAR_OBJS) \
   $(ZIP_OBJS) \
   $(COMPRESS_OBJS) \
@@ -296,16 +286,8 @@ $(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
 
 $(7Z_OBJS): ../../Archive/7z/$(*B).cpp
 	$(COMPL)
-$(BZ2_OBJS): ../../Archive/BZip2/$(*B).cpp
-	$(COMPL)
 $(CAB_OBJS): ../../Archive/Cab/$(*B).cpp
 	$(COMPL)
-$(GZ_OBJS): ../../Archive/GZip/$(*B).cpp
-	$(COMPL)
-$(LZM_OBJS): ../../Archive/Lzma/$(*B).cpp
-	$(COMPL)
-$(SPLIT_OBJS): ../../Archive/Split/$(*B).cpp
-	$(COMPL)
 $(TAR_OBJS): ../../Archive/Tar/$(*B).cpp
 	$(COMPL)
 $(ZIP_OBJS): ../../Archive/Zip/$(*B).cpp