Import Upstream version 2.25

1 files changed, 6 insertions, 3 deletions

diff --git a/Source/SConscript b/Source/SConscript
index c157830..3759f4d 100755
--- a/Source/SConscript
+++ b/Source/SConscript
@@ -13,6 +13,7 @@ makensis_files = Split("""
 	lang.cpp

 	lineparse.cpp

 	makenssi.cpp

+	manifest.cpp

 	mmap.cpp

 	Plugins.cpp

 	ResourceEditor.cpp

@@ -22,6 +23,7 @@ makensis_files = Split("""
 	strlist.cpp

 	tokens.cpp

 	util.cpp

+	winchar.cpp

 	writer.cpp

 """)

 

@@ -34,12 +36,13 @@ bzip2_files = Split("""
 

 lzma_files = Split("""

 	7zip/7zGuids.cpp

-	7zip/Common/CRC.cpp

+	7zip/7zip/Common/OutBuffer.cpp

+	7zip/7zip/Common/StreamUtils.cpp

 	7zip/7zip/Compress/LZ/LZInWindow.cpp

 	7zip/7zip/Compress/LZMA/LZMAEncoder.cpp

-	7zip/7zip/Common/OutBuffer.cpp

 	7zip/7zip/Compress/RangeCoder/RangeCoderBit.cpp

 	7zip/Common/Alloc.cpp

+	7zip/Common/CRC.cpp

 """)

 

 zlib_files = Split("""

@@ -78,7 +81,7 @@ env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
 

 ##### LZMA specific defines

 

-lzma_env = env.Copy()

+lzma_env = env.Clone()

 lzma_env.Append(CPPDEFINES = ['COMPRESS_MF_BT'])

 lzma_files = lzma_env.Object(lzma_files)