moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

winbuild: prefer documented zlib library names

Browse Source 
Check for existence of import and static libraries with documented names
and use them if they do. Fallback to previous names.

According to
https://github.com/madler/zlib/blob/master/win32/README-WIN32.txt on
Windows, the names of the import library is "zdll.lib" and static
library is "zlib.lib".

closes #2354
This commit is contained in:
richardthe3rd 2018-03-02 22:13:42 +00:00 committed by Daniel Stenberg
parent 612bc926f7
commit cc1d4c505e
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
winbuild/MakefileBuild.vc
View File

@ -181,12 +181,26 @@ CARES = static
CARES_CFLAGS = /DUSE_ARES /I"$(DEVEL_INCLUDE)/cares" CARES_CFLAGS = /DUSE_ARES /I"$(DEVEL_INCLUDE)/cares"
!ENDIF !ENDIF
# Depending on how zlib is built the libraries have different names, we
# try to handle them all.
!IF "$(WITH_ZLIB)"=="dll" !IF "$(WITH_ZLIB)"=="dll"
!IF EXISTS("$(DEVEL_LIB)\zlibwapi.lib")
ZLIB_LIBS = zlibwapi.lib
!ELSEIF EXISTS("$(DEVEL_LIB)\zdll.lib")
ZLIB_LIBS = zdll.lib
!ELSE
ZLIB_LIBS = zlib.lib ZLIB_LIBS = zlib.lib
!ENDIF
USE_ZLIB = true USE_ZLIB = true
ZLIB = dll ZLIB = dll
!ELSEIF "$(WITH_ZLIB)"=="static" !ELSEIF "$(WITH_ZLIB)"=="static"
!IF EXISTS("$(DEVEL_LIB)\zlibstat.lib")
ZLIB_LIBS = zlibstat.lib
!ELSEIF EXISTS("$(DEVEL_LIB)\zlib.lib")
ZLIB_LIBS = zlib.lib
!ELSE
ZLIB_LIBS = zlib_a.lib ZLIB_LIBS = zlib_a.lib
!ENDIF
USE_ZLIB = true USE_ZLIB = true
ZLIB = static ZLIB = static
!ENDIF !ENDIF