Merge pull request p7zip-project#55 from jinfeihan57/dev

fix 7zr compiler error!

CPP/7zip/Bundles/Alone7z/makefile.list

@@ -16,6 +16,8 @@ LOCAL_FLAGS=$(TARGET_FLAGS) \
   -DUNICODE \
   -D_UNICODE \
   -DUNIX_USE_WIN_FILE \
+  -DNO_XXHASH \
+  -DFL2_7ZIP_BUILD \
 
 SRCS=\
   ../../../../CPP/7zip/Archive/7z/7zCompressionMode.cpp \
@@ -78,6 +80,9 @@ SRCS=\
   ../../../../CPP/7zip/Compress/LzmaDecoder.cpp \
   ../../../../CPP/7zip/Compress/LzmaEncoder.cpp \
   ../../../../CPP/7zip/Compress/LzmaRegister.cpp \
+  ../../../../CPP/7zip/Compress/FastLzma2Register.cpp \
+  ../../../../CPP/7zip/Compress/XzDecoder.cpp \
+  ../../../../CPP/7zip/Compress/XzEncoder.cpp \
   ../../../../CPP/7zip/UI/Common/ArchiveCommandLine.cpp \
   ../../../../CPP/7zip/UI/Common/ArchiveExtractCallback.cpp \
   ../../../../CPP/7zip/UI/Common/ArchiveOpenCallback.cpp \
@@ -167,6 +172,17 @@ SRCS_C=\
   ../../../../C/XzDec.c \
   ../../../../C/XzEnc.c \
   ../../../../C/XzIn.c \
+  ../../../../C/fast-lzma2/dict_buffer.c \
+  ../../../../C/fast-lzma2/fl2_common.c \
+  ../../../../C/fast-lzma2/fl2_compress.c \
+  ../../../../C/fast-lzma2/fl2_pool.c \
+  ../../../../C/fast-lzma2/fl2_threading.c \
+  ../../../../C/fast-lzma2/lzma2_enc.c \
+  ../../../../C/fast-lzma2/radix_bitpack.c \
+  ../../../../C/fast-lzma2/radix_mf.c \
+  ../../../../C/fast-lzma2/radix_struct.c \
+  ../../../../C/fast-lzma2/range_enc.c \
+  ../../../../C/fast-lzma2/util.c \
 
 StdAfx.h.gch : ../../../myWindows/StdAfx.h
 	rm -f StdAfx.h.gch
@@ -223,6 +239,31 @@ XzEnc.o : ../../../../C/XzEnc.c
 	$(CC) $(CFLAGS) ../../../../C/XzEnc.c
 XzIn.o : ../../../../C/XzIn.c
 	$(CC) $(CFLAGS) ../../../../C/XzIn.c
+
+# fast-lzma2 compile 
+dict_buffer.o : ../../../../C/fast-lzma2/dict_buffer.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/dict_buffer.c 
+fl2_common.o : ../../../../C/fast-lzma2/fl2_common.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/fl2_common.c 
+fl2_compress.o : ../../../../C/fast-lzma2/fl2_compress.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/fl2_compress.c 
+fl2_pool.o : ../../../../C/fast-lzma2/fl2_pool.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/fl2_pool.c 
+fl2_threading.o : ../../../../C/fast-lzma2/fl2_threading.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/fl2_threading.c 
+lzma2_enc.o : ../../../../C/fast-lzma2/lzma2_enc.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/lzma2_enc.c 
+radix_bitpack.o : ../../../../C/fast-lzma2/radix_bitpack.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/radix_bitpack.c 
+radix_mf.o : ../../../../C/fast-lzma2/radix_mf.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/radix_mf.c 
+radix_struct.o : ../../../../C/fast-lzma2/radix_struct.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/radix_struct.c 
+range_enc.o : ../../../../C/fast-lzma2/range_enc.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/range_enc.c 
+util.o : ../../../../C/fast-lzma2/util.c 
+	$(CC) $(CFLAGS) $(LIBS) ../../../../C/fast-lzma2/util.c
+
 7zCompressionMode.o : ../../../../CPP/7zip/Archive/7z/7zCompressionMode.cpp
 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/7z/7zCompressionMode.cpp
 7zDecode.o : ../../../../CPP/7zip/Archive/7z/7zDecode.cpp
@@ -343,6 +384,15 @@ LzmaEncoder.o : ../../../../CPP/7zip/Compress/LzmaEncoder.cpp
 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/LzmaEncoder.cpp
 LzmaRegister.o : ../../../../CPP/7zip/Compress/LzmaRegister.cpp
 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/LzmaRegister.cpp
+
+FastLzma2Register.o : ../../../../CPP/7zip/Compress/FastLzma2Register.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/FastLzma2Register.cpp
+# Xz compile
+XzDecoder.o : ../../../../CPP/7zip/Compress/XzDecoder.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/XzDecoder.cpp
+XzEncoder.o : ../../../../CPP/7zip/Compress/XzEncoder.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/XzEncoder.cpp
+
 ArchiveCommandLine.o : ../../../../CPP/7zip/UI/Common/ArchiveCommandLine.cpp
 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/UI/Common/ArchiveCommandLine.cpp
 ArchiveExtractCallback.o : ../../../../CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
@@ -553,6 +603,9 @@ OBJS=\
  LzmaDecoder.o \
  LzmaEncoder.o \
  LzmaRegister.o \
+ FastLzma2Register.o \
+ XzDecoder.o \
+ XzEncoder.o \
  ArchiveCommandLine.o \
  ArchiveExtractCallback.o \
  ArchiveOpenCallback.o \
@@ -615,4 +668,15 @@ OBJS=\
  mySplitCommandLine.o \
  wine_date_and_time.o \
  $(OBJ_AES) \
+ dict_buffer.o \
+ fl2_common.o \
+ fl2_compress.o \
+ fl2_pool.o \
+ fl2_threading.o \
+ lzma2_enc.o \
+ radix_bitpack.o \
+ radix_mf.o \
+ radix_struct.o \
+ range_enc.o \
+ util.o 
 

check/check_7zr.sh

@@ -106,7 +106,7 @@ rm -fr   ${REP}
 
 
 echo ""
-echo "========"
-echo "ALL DONE"
-echo "========"
+echo "==========="
+echo "ALL SUCCESS"
+echo "==========="
 echo ""