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

Changed the order of the zlib lib files SConstruct searches for so it can find the MinGW specific .a first. 64-bit MinGW has problems with a MSVC generated lib file.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6615 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-09-19 18:54:02 +00:00
parent 85851b0dad
commit fe491ddf94
4 changed files with 16 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -468,8 +468,8 @@ if 'ZLIB_W32' in defenv:
]
)
))
# Search for import library of zlib for VisualC or mingw
for importlib in ['zdll.lib', 'libzdll.a', 'libz.dll.a']:
# Search for import library of zlib for mingw or VisualC
for importlib in ['libzdll.a', 'libz.dll.a', 'zdll.lib']:
defenv['ZLIB_W32_LIB'] = os.path.dirname(str(
defenv.FindFile(importlib,
[