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

Use appropriate zlib DLL depending on version.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6255 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
golubdr 2012-08-22 23:32:05 +00:00
parent 4247359df9
commit 957653f389
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SCons/utils.py
View file

@ -22,8 +22,10 @@ def AddZLib(env, platform, alias='install-utils'):
env.Append(CPPPATH = env['ZLIB_W32_INC'])
env.Append(LIBPATH = env['ZLIB_W32_LIB'])
zlib = ['zdll', 'z']
if 'ZLIB_W32_DLL' in env:
if 'ZLIB_W32_DLL' in env and env['ZLIB_W32_DLL']:
env.DistributeW32Bin(env['ZLIB_W32_DLL'], alias=alias)
if 'ZLIB_W32_NEW_DLL' in env and env['ZLIB_W32_NEW_DLL']:
env.DistributeW32Bin(env['ZLIB_W32_NEW_DLL'], alias=alias)
else:
print 'Please specify folder of zlib for Win32 via ZLIB_W32'
Exit(1)