23.01

CPP/7zip/Bundles/SFXCon/makefile.gcc

@@ -11,11 +11,20 @@ LOCAL_FLAGS_ST =
 MT_OBJS =
 
 
+ifdef SystemDrive
+IS_MINGW = 1
+else
+ifdef SYSTEMDRIVE
+# ifdef OS
+IS_MINGW = 1
+endif
+endif
+
 ifdef ST_MODE
 
-LOCAL_FLAGS_ST = -D_7ZIP_ST
+LOCAL_FLAGS_ST = -DZ7_ST
 
-ifdef SystemDrive
+ifdef IS_MINGW
 MT_OBJS = \
   $O/Threads.o \
 
@@ -35,7 +44,7 @@ endif
 
 LOCAL_FLAGS_SYS =
 
-ifdef SystemDrive
+ifdef IS_MINGW
 
 LOCAL_FLAGS_SYS = \
 
@@ -54,9 +63,9 @@ endif
 LOCAL_FLAGS = \
   $(LOCAL_FLAGS_ST) \
   $(LOCAL_FLAGS_SYS) \
-  -DEXTRACT_ONLY \
-  -DNO_READ_FROM_CODER \
-  -D_SFX \
+  -DZ7_EXTRACT_ONLY \
+  -DZ7_NO_READ_FROM_CODER \
+  -DZ7_SFX \
 
 
 CURRENT_OBJS = \
@@ -163,6 +172,7 @@ CRYPTO_OBJS = \
   $O/MyAes.o \
 
 C_OBJS = \
+  $O/7zStream.o \
   $O/Alloc.o \
   $O/Bcj2.o \
   $O/Bra.o \
@@ -170,7 +180,6 @@ C_OBJS = \
   $O/BraIA64.o \
   $O/CpuArch.o \
   $O/Delta.o \
-  \
   $O/Lzma2Dec.o \
   $O/Lzma2DecMt.o \
   $O/LzmaDec.o \
@@ -185,7 +194,7 @@ C_OBJS = \
   $O/AesOpt.o \
 
 OBJS = \
-	$(LZMA_DEC_OPT_OBJS) \
+  $(LZMA_DEC_OPT_OBJS) \
   $(C_OBJS) \
   $(MT_OBJS) \
   $(SYS_OBJS) \