9.349.34

1 files changed, 18 insertions, 43 deletions

diff --git a/CPP/7zip/UI/Far/makefile b/CPP/7zip/UI/Far/makefile
index 0d6f8d68..2c32d533 100755..100644
--- a/CPP/7zip/UI/Far/makefile
+++ b/CPP/7zip/UI/Far/makefile
@@ -1,24 +1,24 @@
 PROG = 7-ZipFar.dll
 DEF_FILE = Far.def
-CFLAGS = $(CFLAGS) -I ../../../ \
+CFLAGS = $(CFLAGS)  \
   -DEXTERNAL_CODECS
 
 !IFNDEF UNDER_CE
 CFLAGS = $(CFLAGS) -DWIN_LONG_PATH
 !ENDIF
 
-FAR_OBJS = \
+CURRENT_OBJS = \
   $O\ExtractEngine.obj \
   $O\FarUtils.obj \
-  $O\Main.obj \
-  $O\OverwriteDialog.obj \
+  $O\Far.obj \
+  $O\OverwriteDialogFar.obj \
   $O\Plugin.obj \
   $O\PluginCommon.obj \
   $O\PluginDelete.obj \
   $O\PluginRead.obj \
   $O\PluginWrite.obj \
   $O\ProgressBox.obj \
-  $O\UpdateCallback100.obj \
+  $O\UpdateCallbackFar.obj \
 
 COMMON_OBJS = \
   $O\IntToString.obj \
@@ -31,22 +31,27 @@ COMMON_OBJS = \
 
 WIN_OBJS = \
   $O\DLL.obj \
-  $O\Error.obj \
+  $O\ErrorMsg.obj \
   $O\FileDir.obj \
   $O\FileFind.obj \
   $O\FileIO.obj \
+  $O\FileLink.obj \
   $O\FileName.obj \
   $O\PropVariant.obj \
-  $O\PropVariantConversions.obj \
+  $O\PropVariantConv.obj \
   $O\Registry.obj \
   $O\Synchronization.obj \
-  $O\Time.obj \
+  $O\TimeUtils.obj \
 
 7ZIP_COMMON_OBJS = \
   $O\FilePathAutoRename.obj \
   $O\FileStreams.obj \
+  $O\LimitedStreams.obj \
   $O\ProgressUtils.obj \
+  $O\PropId.obj \
+  $O\StreamObjects.obj \
   $O\StreamUtils.obj \
+  $O\UniqBlocks.obj \
 
 UI_COMMON_OBJS = \
   $O\ArchiveExtractCallback.obj \
@@ -57,6 +62,7 @@ UI_COMMON_OBJS = \
   $O\LoadCodecs.obj \
   $O\OpenArchive.obj \
   $O\PropIDUtils.obj \
+  $O\SetProperties.obj \
   $O\SortUtils.obj \
   $O\UpdateAction.obj \
   $O\UpdateCallback.obj \
@@ -74,6 +80,9 @@ AGENT_OBJS = \
   $O\AgentProxy.obj \
   $O\UpdateCallbackAgent.obj \
 
+COMPRESS_OBJS = \
+  $O\CopyCoder.obj \
+
 C_OBJS = \
   $O\Alloc.obj \
   $O\CpuArch.obj \
@@ -82,38 +91,4 @@ C_OBJS = \
 
 !include "../../Crc.mak"
 
-OBJS = \
-  $O\StdAfx.obj \
-  $(FAR_OBJS) \
-  $(COMMON_OBJS) \
-  $(WIN_OBJS) \
-  $(7ZIP_COMMON_OBJS) \
-  $(UI_COMMON_OBJS) \
-  $(AR_COMMON_OBJS) \
-  $(AGENT_OBJS) \
-  $O\CopyCoder.obj \
-  $(C_OBJS) \
-  $(ASM_OBJS) \
-  $O\resource.res
-
-!include "../../../Build.mak"
-
-$(FAR_OBJS): $(*B).cpp
-	$(COMPL)
-$(COMMON_OBJS): ../../../Common/$(*B).cpp
-	$(COMPL)
-$(WIN_OBJS): ../../../Windows/$(*B).cpp
-	$(COMPL)
-$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
-	$(COMPL)
-$(UI_COMMON_OBJS): ../Common/$(*B).cpp
-	$(COMPL)
-$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
-	$(COMPL)
-$(AGENT_OBJS): ../Agent/$(*B).cpp
-	$(COMPL)
-$O\CopyCoder.obj: ../../Compress/$(*B).cpp
-	$(COMPL)
-$(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O2)
-!include "../../Asm.mak"
+!include "../../7zip.mak"