From cc1d4c505ef1d052bbacf68714694e7c24427471 Mon Sep 17 00:00:00 2001 From: richardthe3rd Date: Fri, 2 Mar 2018 22:13:42 +0000 Subject: 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 --- winbuild/MakefileBuild.vc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 -- cgit v1.2.3