9.09 beta

CPP/7zip/Bundles/Format7zExtract/makefile

@@ -2,8 +2,6 @@ PROG = 7zxa.dll
 DEF_FILE = ../../Archive/Archive2.def
 CFLAGS = $(CFLAGS) -I ../../../ \
   -DEXTRACT_ONLY \
-  -DCOMPRESS_MT \
-  -DCOMPRESS_BZIP2_MT \
 
 COMMON_OBJS = \
   $O\CRC.obj \
@@ -92,18 +90,19 @@ CRYPTO_OBJS = \
   $O\MyAes.obj \
 
 C_OBJS = \
-  $O\Aes.obj \
   $O\Alloc.obj \
   $O\Bra.obj \
   $O\Bra86.obj \
   $O\BraIA64.obj \
+  $O\CpuArch.obj \
   $O\Delta.obj \
   $O\Lzma2Dec.obj \
   $O\LzmaDec.obj \
   $O\Sha256.obj \
   $O\Threads.obj \
 
-!include "../../Crc2.mak"
+!include "../../Aes.mak"
+!include "../../Crc.mak"
 
 OBJS = \
   $O\StdAfx.obj \
@@ -117,7 +116,7 @@ OBJS = \
   $(COMPRESS_OBJS) \
   $(CRYPTO_OBJS) \
   $(C_OBJS) \
-  $(CRC_OBJS) \
+  $(ASM_OBJS) \
   $O\resource.res
 
 
@@ -146,4 +145,4 @@ $(CRYPTO_OBJS): ../../Crypto/$(*B).cpp
 $(C_OBJS): ../../../../C/$(*B).c
 	$(COMPL_O2)
 
-!include "../../Crc.mak"
+!include "../../Asm.mak"