4.45 beta

CPP/7zip/Archive/7z/makefile

@@ -1,8 +1,15 @@
 PROG = 7z.dll
 DEF_FILE = ../Archive.def
-CFLAGS = $(CFLAGS) -I ../../../ -DCOMPRESS_MT
+CFLAGS = $(CFLAGS) -I ../../../  \
+  -DCOMPRESS_MT \
+  -DEXTERNAL_CODECS \
+
 LIBS = $(LIBS) oleaut32.lib user32.lib
 
+AR_OBJS = \
+  $O\ArchiveExports.obj \
+  $O\DllExports.obj \
+
 7Z_OBJS = \
   $O\7zCompressionMode.obj \
   $O\7zDecode.obj \
@@ -14,16 +21,13 @@ LIBS = $(LIBS) oleaut32.lib user32.lib
   $O\7zHandlerOut.obj \
   $O\7zHeader.obj \
   $O\7zIn.obj \
-  $O\7zMethodID.obj \
-  $O\7zMethods.obj \
   $O\7zOut.obj \
   $O\7zProperties.obj \
   $O\7zSpecStream.obj \
   $O\7zUpdate.obj \
-  $O\DllExports.obj \
+  $O\7zRegister.obj \
 
 COMMON_OBJS = \
-  $O\Alloc.obj \
   $O\CRC.obj \
   $O\IntToString.obj \
   $O\NewHandler.obj \
@@ -41,9 +45,12 @@ WIN_OBJS = \
   $O\Synchronization.obj
 
 7ZIP_COMMON_OBJS = \
+  $O\CreateCoder.obj \
   $O\InOutTempBuffer.obj \
+  $O\FilterCoder.obj \
   $O\LimitedStreams.obj \
   $O\LockedStream.obj \
+  $O\MethodId.obj \
   $O\OutBuffer.obj \
   $O\ProgressUtils.obj \
   $O\StreamBinder.obj \
@@ -51,30 +58,37 @@ WIN_OBJS = \
   $O\StreamUtils.obj \
 
 AR_COMMON_OBJS = \
-  $O\CodecsPath.obj \
-  $O\CoderLoader.obj \
   $O\CoderMixer2.obj \
   $O\CoderMixer2MT.obj \
   $O\CrossThreadProgress.obj \
-  $O\FilterCoder.obj \
   $O\InStreamWithCRC.obj \
   $O\ItemNameUtils.obj \
   $O\MultiStream.obj \
   $O\OutStreamWithCRC.obj \
   $O\ParseProperties.obj \
 
+C_OBJS = \
+  $O\Alloc.obj \
+
+!include "../../Crc2.mak"
+
 OBJS = \
   $O\StdAfx.obj \
+  $(AR_OBJS) \
   $(7Z_OBJS) \
   $(COMMON_OBJS) \
   $(WIN_OBJS) \
   $(7ZIP_COMMON_OBJS) \
   $(AR_COMMON_OBJS) \
   $O\CopyCoder.obj \
+  $(C_OBJS) \
+  $(CRC_OBJS) \
   $O\resource.res
 
 !include "../../../Build.mak"
 
+$(AR_OBJS): ../$(*B).cpp
+	$(COMPL)
 $(7Z_OBJS): $(*B).cpp
 	$(COMPL)
 $(COMMON_OBJS): ../../../Common/$(*B).cpp
@@ -87,3 +101,6 @@ $(AR_COMMON_OBJS): ../Common/$(*B).cpp
 	$(COMPL)
 $O\CopyCoder.obj: ../../Compress/Copy/$(*B).cpp
 	$(COMPL)
+$(C_OBJS): ../../../../C/$(*B).c
+	$(COMPL_O2)
+!include "../../Crc.mak"