9.09 beta

CPP/7zip/Bundles/Format7zF/makefile

@@ -2,9 +2,6 @@ PROG = 7z.dll
 DEF_FILE = ../../Archive/Archive2.def
 CFLAGS = $(CFLAGS) -I ../../../ \
   -DEXTERNAL_CODECS \
-  -DCOMPRESS_MT \
-  -DCOMPRESS_BZIP2_MT \
-  -DCOMPRESS_MF_MT \
 
 !IFNDEF UNDER_CE
 CFLAGS = $(CFLAGS) -D_7ZIP_LARGE_PAGES
@@ -57,6 +54,7 @@ WIN_OBJS = \
 AR_OBJS = \
   $O\ArchiveExports.obj \
   $O\DllExports2.obj \
+  $O\ApmHandler.obj \
   $O\ArjHandler.obj \
   $O\Bz2Handler.obj \
   $O\CpioHandler.obj \
@@ -257,12 +255,12 @@ CRYPTO_OBJS = \
 C_OBJS = \
   $O\7zBuf2.obj \
   $O\7zStream.obj \
-  $O\Aes.obj \
   $O\Alloc.obj \
   $O\Bra.obj \
   $O\Bra86.obj \
   $O\BraIA64.obj \
   $O\BwtSort.obj \
+  $O\CpuArch.obj \
   $O\Delta.obj \
   $O\HuffEnc.obj \
   $O\LzFind.obj \
@@ -281,7 +279,8 @@ C_OBJS = \
   $O\XzEnc.obj \
   $O\XzIn.obj \
 
-!include "../../Crc2.mak"
+!include "../../Aes.mak"
+!include "../../Crc.mak"
 
 OBJS = \
   $O\StdAfx.obj \
@@ -306,7 +305,7 @@ OBJS = \
   $(COMPRESS_OBJS) \
   $(CRYPTO_OBJS) \
   $(C_OBJS) \
-  $(CRC_OBJS) \
+  $(ASM_OBJS) \
   $O\resource.res
 
 
@@ -357,4 +356,4 @@ $(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
 
-!include "../../Crc.mak"
+!include "../../Asm.mak"