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

#2918870: Detect Win32 zlib in flat and include/lib directory structure, updated INSTALL and build documentation, removed obsolete Source\zlib\DEFLATE.H.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6039 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
f0rt 2010-03-27 15:52:04 +00:00
parent cdf7735a77
commit b402798885
4 changed files with 46 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

22
SConstruct
View file

@ -376,8 +376,26 @@ defenv.Append(LIBPATH = Split('$APPEND_LIBPATH'))
defenv.Default('$BUILD_PREFIX')
if 'ZLIB_W32' in defenv:
defenv['ZLIB_W32_INC'] = os.path.join(defenv['ZLIB_W32'], 'include')
defenv['ZLIB_W32_LIB'] = os.path.join(defenv['ZLIB_W32'], 'lib')
defenv['ZLIB_W32_INC'] = os.path.dirname(str(
defenv.FindFile('zlib.h',
[
defenv['ZLIB_W32'],
os.path.join(defenv['ZLIB_W32'], 'include')
]
)
))
# Search for import library of zlib for VisualC or mingw
for importlib in ['zdll.lib', 'libzdll.a']:
defenv['ZLIB_W32_LIB'] = os.path.dirname(str(
defenv.FindFile(importlib,
[
defenv['ZLIB_W32'],
os.path.join(defenv['ZLIB_W32'], 'lib')
]
)
))
if defenv['ZLIB_W32_LIB']:
break
defenv['ZLIB_W32_DLL'] = defenv.FindFile('zlib1.dll',
[defenv['ZLIB_W32'], defenv['ZLIB_W32_LIB']])