4.58 beta

1 files changed, 7 insertions, 24 deletions

diff --git a/CPP/7zip/Bundles/Format7zExtractR/makefile b/CPP/7zip/Bundles/Format7zExtractR/makefile
index 0632e718..55069721 100755
--- a/CPP/7zip/Bundles/Format7zExtractR/makefile
+++ b/CPP/7zip/Bundles/Format7zExtractR/makefile
@@ -74,14 +74,10 @@ SWAP_OPT_OBJS = \
   $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\BranchCoder.obj \
+  $O\BranchMisc.obj \
   $O\BranchRegister.obj \
   $O\BCJRegister.obj \
   $O\BCJ2Register.obj \
@@ -90,26 +86,19 @@ 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 \
+  $O\Alloc.obj \
+  $O\Bra.obj \
+  $O\Bra86.obj \
+  $O\BraIA64.obj \
+  $O\LzmaDec.obj \
   $O\Threads.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 \
   $(CONSOLE_OBJS) \
@@ -123,10 +112,8 @@ OBJS = \
   $(BRANCH_OPT_OBJS) \
   $(SWAP_OPT_OBJS) \
   $(COPY_OBJS) \
-  $(LZ_OBJS) \
   $(LZMA_OPT_OBJS) \
   $(C_OBJS) \
-  $(C_BRANCH_OBJS) \
   $O\resource.res
 
 
@@ -154,12 +141,8 @@ $(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)
 
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
-$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
-	$(COMPL_O2)