23.01

CPP/7zip/Bundles/Format7zExtractR/StdAfx.h

@@ -1,8 +1,11 @@
 // StdAfx.h
 
-#ifndef __STDAFX_H
-#define __STDAFX_H
+#ifndef ZIP7_INC_STDAFX_H
+#define ZIP7_INC_STDAFX_H
 
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+#pragma warning(disable : 4464) // relative include path contains '..'
+#endif
 #include "../../../Common/Common.h"
 
 #endif

CPP/7zip/Bundles/Format7zExtractR/makefile

@@ -1,8 +1,8 @@
 PROG = 7zxr.dll
 DEF_FILE = ../../Archive/Archive2.def
 CFLAGS = $(CFLAGS) \
-  -DEXTRACT_ONLY \
-  -D_NO_CRYPTO
+  -DZ7_EXTRACT_ONLY \
+  -DZ7_NO_CRYPTO
 
 COMMON_OBJS = \
   $O\CRC.obj \
@@ -77,6 +77,7 @@ COMPRESS_OBJS = \
   $O\LzmaRegister.obj \
 
 C_OBJS = \
+  $O\7zStream.obj \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bra.obj \
@@ -88,6 +89,7 @@ C_OBJS = \
   $O\Lzma2DecMt.obj \
   $O\LzmaDec.obj \
   $O\MtDec.obj \
+  $O\SwapBytes.obj \
   $O\Threads.obj \
 
 !include "../../Crc.mak"