9.38

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

@@ -1,24 +1,42 @@
 PROG = lzma
-CXX = g++ -O2 -Wall
-CXX_C = gcc -O2 -Wall
-LIB = -lm
-RM = rm -f
-CFLAGS = -c -D_7ZIP_ST
+CXX = g++ -O2
+# -Wall -Werror -Wno-delete-non-virtual-dtor
+CXX_C = gcc -O2 -Wall -Werror
 
 ifdef SystemDrive
 IS_MINGW = 1
 endif
 
 ifdef IS_MINGW
+
+RM = del
+CFLAGS = -c
+LIB2 = -loleaut32 -luuid
+LDFLAGS = -s
+
 FILE_IO =FileIO
 FILE_IO_2 =Windows/$(FILE_IO)
-LIB2 = -luuid
+
+MT_FILES = \
+  System.o \
+  LzFindMt.o \
+  Threads.o \
+
 else
+
+RM = rm -f
+CFLAGS = -c -D_7ZIP_ST
+
 FILE_IO =C_FileIO
 FILE_IO_2 =Common/$(FILE_IO)
+
+
 endif
 
+
 OBJS = \
+  $(MT_FILES) \
+  $(FILE_IO).o \
   LzmaAlone.o \
   Bench.o \
   BenchCon.o \
@@ -32,7 +50,6 @@ OBJS = \
   FilterCoder.o \
   MethodProps.o \
   StreamUtils.o \
-  $(FILE_IO).o \
   CommandLineParser.o \
   CRC.o \
   CrcReg.o \
@@ -58,7 +75,7 @@ OBJS = \
 all: $(PROG)
 
 $(PROG): $(OBJS)
-	$(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2)
+	$(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB2)
 
 LzmaAlone.o: LzmaAlone.cpp
 	$(CXX) $(CFLAGS) LzmaAlone.cpp
@@ -133,6 +150,11 @@ StringToInt.o: ../../../Common/StringToInt.cpp
 PropVariant.o: ../../../Windows/PropVariant.cpp
 	$(CXX) $(CFLAGS) ../../../Windows/PropVariant.cpp
 
+ifdef MT_FILES
+System.o: ../../../Windows/System.cpp
+	$(CXX) $(CFLAGS) ../../../Windows/System.cpp
+endif
+
 7zCrc.o: ../../../../C/7zCrc.c
 	$(CXX_C) $(CFLAGS) ../../../../C/7zCrc.c
 
@@ -151,6 +173,14 @@ CpuArch.o: ../../../../C/CpuArch.c
 LzFind.o: ../../../../C/LzFind.c
 	$(CXX_C) $(CFLAGS) ../../../../C/LzFind.c
 
+ifdef MT_FILES
+LzFindMt.o: ../../../../C/LzFindMt.c
+	$(CXX_C) $(CFLAGS) ../../../../C/LzFindMt.c
+
+Threads.o: ../../../../C/Threads.c
+	$(CXX_C) $(CFLAGS) ../../../../C/Threads.c
+endif
+
 LzmaDec.o: ../../../../C/LzmaDec.c
 	$(CXX_C) $(CFLAGS) ../../../../C/LzmaDec.c