9.34

CPP/7zip/Bundles/SFXSetup/makefile

@@ -1,14 +1,14 @@
 PROG = 7zS.sfx
-CFLAGS = $(CFLAGS) -I ../../../ \
+CFLAGS = $(CFLAGS) \
   -DNO_REGISTRY \
   -DEXTRACT_ONLY \
   -DNO_READ_FROM_CODER \
   -D_SFX \
   -D_NO_CRYPTO \
 
-SFX_WIN_OBJS = \
-  $O\Main.obj \
-  $O\ExtractCallback.obj \
+CURRENT_OBJS = \
+  $O\SfxSetup.obj \
+  $O\ExtractCallbackSfx.obj \
   $O\ExtractEngine.obj \
 
 COMMON_OBJS = \
@@ -25,7 +25,7 @@ COMMON_OBJS = \
 
 WIN_OBJS = \
   $O\DLL.obj \
-  $O\Error.obj \
+  $O\ErrorMsg.obj \
   $O\FileDir.obj \
   $O\FileFind.obj \
   $O\FileIO.obj \
@@ -47,6 +47,7 @@ WIN_CTRL_OBJS = \
   $O\LockedStream.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
+  $O\PropId.obj \
   $O\StreamBinder.obj \
   $O\StreamObjects.obj \
   $O\StreamUtils.obj \
@@ -58,6 +59,9 @@ UI_COMMON_OBJS = \
   $O\LoadCodecs.obj \
   $O\OpenArchive.obj \
 
+EXPLORER_OBJS = \
+  $O\MyMessages.obj \
+
 FM_OBJS = \
   $O\FormatUtils.obj \
   $O\ProgressDialog.obj \
@@ -74,7 +78,6 @@ AR_COMMON_OBJS = \
   $O\7zExtract.obj \
   $O\7zFolderOutStream.obj \
   $O\7zHandler.obj \
-  $O\7zHeader.obj \
   $O\7zIn.obj \
   $O\7zRegister.obj \
 
@@ -101,53 +104,4 @@ C_OBJS = \
 
 !include "../../Crc.mak"
 
-OBJS = \
-  $O\StdAfx.obj \
-  $(SFX_WIN_OBJS) \
-  $(COMMON_OBJS) \
-  $(WIN_OBJS) \
-  $(WIN_CTRL_OBJS) \
-  $(7ZIP_COMMON_OBJS) \
-  $(UI_COMMON_OBJS) \
-  $(FM_OBJS)\
-  $(AR_COMMON_OBJS) \
-  $(7Z_OBJS) \
-  $(COMPRESS_OBJS) \
-  $O\MyMessages.obj \
-  $(C_OBJS) \
-  $(ASM_OBJS) \
-  $O\resource.res
-
-
-!include "../../../Build.mak"
-
-$(SFX_WIN_OBJS): $(*B).cpp
-	$(COMPL)
-
-$(COMMON_OBJS): ../../../Common/$(*B).cpp
-	$(COMPL)
-$(WIN_OBJS): ../../../Windows/$(*B).cpp
-	$(COMPL)
-$(WIN_CTRL_OBJS): ../../../Windows/Control/$(*B).cpp
-	$(COMPL)
-$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
-	$(COMPL)
-$(UI_COMMON_OBJS): ../../UI/Common/$(*B).cpp
-	$(COMPL)
-$(FM_OBJS): ../../UI/FileManager//$(*B).cpp
-	$(COMPL)
-$(AR_COMMON_OBJS): ../../Archive/Common/$(*B).cpp
-	$(COMPL)
-
-$(7Z_OBJS): ../../Archive/7z/$(*B).cpp
-	$(COMPL)
-$(COMPRESS_OBJS): ../../Compress/$(*B).cpp
-	$(COMPL)
-
-$O\MyMessages.obj: ../../UI/Explorer/MyMessages.cpp
-	$(COMPL)
-
-$(C_OBJS): ../../../../C/$(*B).c
-	$(COMPL_O2)
-
-!include "../../Asm.mak"
+!include "../../7zip.mak"