4.58 beta

CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp

@@ -687,19 +687,6 @@ SOURCE=..\..\UI\FileManager\FormatUtils.h
 # Begin Group "C"
 
 # PROP Default_Filter ""
-# Begin Group "C Branch"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\..\C\7zCrc.c
@@ -720,6 +707,24 @@ SOURCE=..\..\..\..\C\Alloc.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\C\Bra.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Bra86.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\LzmaDec.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\LzmaDec.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\C\Threads.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File

CPP/7zip/Bundles/SFXSetup/makefile

@@ -83,9 +83,9 @@ AR_COMMON_OBJS = \
   $O\7zRegister.obj \
 
 BRANCH_OPT_OBJS = \
-  $O\BranchCoder.obj \
   $O\x86.obj \
   $O\x86_2.obj \
+  $O\BranchCoder.obj \
   $O\BCJRegister.obj \
   $O\BCJ2Register.obj \
 
@@ -102,11 +102,10 @@ LZMA_OPT_OBJS = \
 
 C_OBJS = \
   $O\Alloc.obj \
+  $O\Bra86.obj \
+  $O\LzmaDec.obj \
   $O\Threads.obj \
 
-C_BRANCH_OBJS = \
-  $O\BranchX86.obj \
-
 !include "../../Crc2.mak"
 
 OBJS = \
@@ -127,7 +126,6 @@ OBJS = \
   $(LZMA_OPT_OBJS) \
   $O\MyMessages.obj \
   $(C_OBJS) \
-  $(C_BRANCH_OBJS) \
   $(CRC_OBJS) \
   $O\resource.res
 
@@ -169,8 +167,6 @@ $O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp
 	$(COMPL)
 
 $(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O1)
-$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
-	$(COMPL_O1)
+	$(COMPL_O2)
 
 !include "../../Crc.mak"