dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

applied patch #2918870 - use of the zlib compression library provided by the system

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6030 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
f0rt 2010-02-07 21:24:09 +00:00
parent 9f7710ace6
commit c39ffff404
34 changed files with 280 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/SConscript
View file

@ -46,11 +46,6 @@ lzma_files = Split("""
7zip/Common/CRC.cpp
""")
zlib_files = Split("""
zlib/deflate.c
zlib/trees.c
""")
libs = Split("""
gdi32
user32
@ -58,7 +53,7 @@ libs = Split("""
iconv
""")
Import('env AddAvailableLibs')
Import('env AddAvailableLibs AddZLib')
##### Use available libraries
@ -68,6 +63,7 @@ if env['PLATFORM'] == 'win32':
libs += ['version']
AddAvailableLibs(env, libs)
AddZLib(env, env['PLATFORM'], 'install-compiler')
##### Defines
@ -87,7 +83,7 @@ lzma_files = lzma_env.Object(lzma_files)
##### Compile makensis
files = makensis_files + bzip2_files + lzma_files + zlib_files
files = makensis_files + bzip2_files + lzma_files
makensis = env.Program(target, files)