diff options
| author | richardthe3rd <richard.alcock@gmail.com> | 2018-03-02 22:13:42 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-03-04 23:02:51 +0100 |
| commit | cc1d4c505ef1d052bbacf68714694e7c24427471 (patch) | |
| tree | 592d17db2162f02841dc80663c59a2c340d1bcfb | |
| parent | 612bc926f7b40b2867fe1a28cf686c2131c72110 (diff) | |
winbuild: prefer documented zlib library names
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
| -rw-r--r-- | winbuild/MakefileBuild.vc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 54160beb1..28500aeba 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -181,12 +181,26 @@ CARES = static CARES_CFLAGS = /DUSE_ARES /I"$(DEVEL_INCLUDE)/cares"
!ENDIF
+# Depending on how zlib is built the libraries have different names, we
+# try to handle them all.
!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
+!ENDIF
USE_ZLIB = true
ZLIB = dll
!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
+!ENDIF
USE_ZLIB = true
ZLIB = static
!ENDIF
|