1 files changed, 56 insertions, 13 deletions
diff --git a/CPP/7zip/Bundles/LzmaCon/makefile.gcc b/CPP/7zip/Bundles/LzmaCon/makefile.gcc
index 59a70de..ae9e27a 100755..100644
--- a/CPP/7zip/Bundles/LzmaCon/makefile.gcc
+++ b/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 \
@@ -30,15 +48,18 @@ OBJS = \
   CWrappers.o \
   FileStreams.o \
   FilterCoder.o \
+  MethodProps.o \
   StreamUtils.o \
-  $(FILE_IO).o \
   CommandLineParser.o \
   CRC.o \
+  CrcReg.o \
   IntToString.o \
   MyString.o \
+  MyVector.o \
+  MyWindows.o \
   StringConvert.o \
   StringToInt.o \
-  MyVector.o \
+  PropVariant.o \
   7zCrc.o \
   7zCrcOpt.o \
   Alloc.o \
@@ -54,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
@@ -89,6 +110,9 @@ FileStreams.o: ../../Common/FileStreams.cpp
 FilterCoder.o: ../../Common/FilterCoder.cpp
 	$(CXX) $(CFLAGS) ../../Common/FilterCoder.cpp
 
+MethodProps.o: ../../Common/MethodProps.cpp
+	$(CXX) $(CFLAGS) ../../Common/MethodProps.cpp
+
 StreamUtils.o: ../../Common/StreamUtils.cpp
 	$(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
 
@@ -102,8 +126,8 @@ CommandLineParser.o: ../../../Common/CommandLineParser.cpp
 CRC.o: ../../../Common/CRC.cpp
 	$(CXX) $(CFLAGS) ../../../Common/CRC.cpp
 
-MyWindows.o: ../../../Common/MyWindows.cpp
-	$(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
+CrcReg.o: ../../../Common/CrcReg.cpp
+	$(CXX) $(CFLAGS) ../../../Common/CrcReg.cpp
 
 IntToString.o: ../../../Common/IntToString.cpp
 	$(CXX) $(CFLAGS) ../../../Common/IntToString.cpp
@@ -111,14 +135,25 @@ IntToString.o: ../../../Common/IntToString.cpp
 MyString.o: ../../../Common/MyString.cpp
 	$(CXX) $(CFLAGS) ../../../Common/MyString.cpp
 
+MyVector.o: ../../../Common/MyVector.cpp
+	$(CXX) $(CFLAGS) ../../../Common/MyVector.cpp
+
+MyWindows.o: ../../../Common/MyWindows.cpp
+	$(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
+
 StringConvert.o: ../../../Common/StringConvert.cpp
 	$(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
 
 StringToInt.o: ../../../Common/StringToInt.cpp
 	$(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
 
-MyVector.o: ../../../Common/MyVector.cpp
-	$(CXX) $(CFLAGS) ../../../Common/MyVector.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
@@ -138,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