Contrib/SubStart/ReadMe.txt | 34 34 + 0 - 0 !
Contrib/SubStart/SConscript | 16 16 + 0 - 0 !
Contrib/SubStart/substart.c | 109 109 + 0 - 0 !
Contrib/VPatch/Source/GenPat/SConscript | 1 1 + 0 - 0 !
Contrib/VPatch/Source/GenPat/adler32.cpp | 63 4 + 59 - 0 !
Contrib/zip2exe/SConscript | 7 1 + 6 - 0 !
Contrib/zip2exe/zlib/ioapi.c | 2 1 + 1 - 0 !
Contrib/zip2exe/zlib/unzip.c | 2 1 + 1 - 0 !
Contrib/zip2exe/zlib/unzip.h | 2 1 + 1 - 0 !
Docs/src/build.but | 29 27 + 2 - 0 !
Examples/makensis.nsi | 10 7 + 3 - 0 !
INSTALL | 11 10 + 1 - 0 !
SCons/utils.py | 30 28 + 2 - 0 !
SConstruct | 69 60 + 9 - 0 !
Source/SConscript | 10 3 + 7 - 0 !
Source/Tests/SConscript | 14 7 + 7 - 0 !
Source/build.cpp | 2 1 + 1 - 0 !
Source/czlib.h | 10 8 + 2 - 0 !
Source/makenssi.cpp | 2 1 + 1 - 0 !
Source/zlib/INFBLOCK.C | 2 1 + 1 - 0 !
20 files changed, 321 insertions(+), 104 deletions(-)

 usage of the zlib compression library provided by the system
 The changes were cherry-picked from the following upstream svn revisions
 6030, 6039, 6044 and 6063. Furthermore the NSIS embedded inflate function
 was made compatible with the one from zlib. 

SCons/Config/gnu | 6 0 + 6 - 0 !
Source/DialogTemplate.cpp | 12 6 + 6 - 0 !
Source/Platform.h | 17 10 + 7 - 0 !
Source/Plugins.cpp | 6 3 + 3 - 0 !
Source/ResourceEditor.cpp | 38 14 + 24 - 0 !
Source/ResourceEditor.h | 10 5 + 5 - 0 !
Source/ResourceVersionInfo.cpp | 2 1 + 1 - 0 !
Source/fileform.cpp | 2 1 + 1 - 0 !
Source/mmap.cpp | 2 1 + 1 - 0 !
Source/script.cpp | 10 5 + 5 - 0 !
Source/util.cpp | 18 9 + 9 - 0 !
11 files changed, 55 insertions(+), 68 deletions(-)

 build makensis and portable utilities natively for 64-bit systems

SConstruct | 16 8 + 8 - 0 !
1 file changed, 8 insertions(+), 8 deletions(-)

 use variant_dir instead of build_dir keyword in sconstruct file
 The use of the build_dir keyword has been declared deprecated since
 scons version 0.98. The variant_dir keyword should be used instead.

Contrib/System/SysFunc.nsh | 2 1 + 1 - 0 !
Contrib/nsDialogs/InstallOptions.nsi | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 use relative paths in .nsi script examples
 The patch replaces the absolute paths in the example scripts of System
 and nsDialogs with relative paths.

Contrib/InstallOptions/InstallerOptions.cpp | 4 3 + 1 - 0 !
SCons/Tools/crossmingw.py | 5 5 + 0 - 0 !
2 files changed, 8 insertions(+), 1 deletion(-)

 allow building with mingw-w64
 This patch enables building NSIS with the mingw-w64 compiler.

SCons/utils.py | 13 8 + 5 - 0 !
1 file changed, 8 insertions(+), 5 deletions(-)

 avoid a clash when scons is run in parallel operation.
 This patch skips the unnecessary configuring when cleaning targets and
 as a result avoids a clash when scons is run in parallel operation.

Source/exehead/util.h | 8 8 + 0 - 0 !
Source/zlib/ZUTIL.H | 8 2 + 6 - 0 !
2 files changed, 10 insertions(+), 6 deletions(-)

 use zmemcpy function of the same calling convention.
 The zmemcpy function used to be mapped to the standard C library memcpy
 function for POSIX systems. However the prototype of the standard C

SCons/Config/gnu | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 make plugins not depend on libgcc_s_sjlj-1.dll nor
 libdtdc++-6.dll.
 .
 Plugins must not depend on a shared libgcc. Newer MinGW GCC builds now also
 default to a shared libstdc++, so plugins now also require -static-libstdc++.
 .
 Without this patch, C++ plugins such as NSISdl fail to load.