Update zlib to version 1.2.11

7 files changed, 18 insertions, 10 deletions

diff --git a/compat/zlib/win32/Makefile.msc b/compat/zlib/win32/Makefile.msc
index 67b7731..6831882 100644
--- a/compat/zlib/win32/Makefile.msc
+++ b/compat/zlib/win32/Makefile.msc
@@ -1,5 +1,5 @@
 # Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 #
 # Usage:
 #   nmake -f win32/Makefile.msc                          (standard build)
diff --git a/compat/zlib/win32/README-WIN32.txt b/compat/zlib/win32/README-WIN32.txt
index 16adcca..df7ab7f 100644
--- a/compat/zlib/win32/README-WIN32.txt
+++ b/compat/zlib/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.10 is a general purpose data compression library.  All the code is
+zlib 1.2.11 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
 
 Manifest:
 
-The package zlib-1.2.10-win32-x86.zip will contain the following files:
+The package zlib-1.2.11-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
@@ -72,7 +72,7 @@ are too numerous to cite here.
 
 Copyright notice:
 
-  (C) 1995-2012 Jean-loup Gailly and Mark Adler
+  (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/compat/zlib/win32/README.txt b/compat/zlib/win32/README.txt
index de1d05a..bd3d18d 100644
--- a/compat/zlib/win32/README.txt
+++ b/compat/zlib/win32/README.txt
@@ -6,7 +6,7 @@ What's here
 

 Source

 ======

-  zlib version 1.2.10

+  zlib version 1.2.11

   available at http://www.gzip.org/zlib/

 

 

@@ -37,7 +37,7 @@ Build info
 

 Copyright notice

 ================

-  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler

+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler

 

   This software is provided 'as-is', without any express or implied

   warranty.  In no event will the authors be held liable for any damages

diff --git a/compat/zlib/win32/USAGE.txt b/compat/zlib/win32/USAGE.txt
index 48e594e..22829eb 100644
--- a/compat/zlib/win32/USAGE.txt
+++ b/compat/zlib/win32/USAGE.txt
@@ -2,6 +2,9 @@
 Installing ZLIB1.DLL

 ====================

   Copy ZLIB1.DLL to the SYSTEM or the SYSTEM32 directory.

+  

+  If you want to install the 32-bit dll on a 64-bit

+  machine, use the SysWOW64 directory instead.

 

 

 Using ZLIB1.DLL with Microsoft Visual C++

@@ -20,12 +23,17 @@ Using ZLIB1.DLL with gcc/MinGW
    1. Install the supplied header files "zlib.h" and "zconf.h"

       into the INCLUDE directory.

 

-   2. Copy the supplied library file "zdll.lib" to "libzdll.a":

+   2. (32-bit): Copy the supplied library file "zdll.lib" to "libzdll.a":

         cp lib/zdll.lib lib/libzdll.a

 

       OR

 

-   2' Build the import library from the supplied "zlib.def":

+   2'. (64-bit): Copy the supplied library file "libz.dll.a" to "libzdll.a":

+        cp lib/libz.dll.a lib/libzdll.a

+

+      OR

+

+   2'' Build the import library from the supplied "zlib.def":

         dlltool -D zlib1.dll -d lib/zlib.def -l lib/libzdll.a

 

    3. Install "libzdll.a" into the LIB directory.

diff --git a/compat/zlib/win32/VisualC.txt b/compat/zlib/win32/VisualC.txt
index 579a5fc..1005b21 100644
--- a/compat/zlib/win32/VisualC.txt
+++ b/compat/zlib/win32/VisualC.txt
@@ -1,3 +1,3 @@
 
 To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the projects/ directory.
+use the appropriate project from the contrib/vstudio/ directory.
diff --git a/compat/zlib/win32/zdll.lib b/compat/zlib/win32/zdll.lib
index 5807541..a3e9a39 100644..100755
--- a/compat/zlib/win32/zdll.lib
+++ b/compat/zlib/win32/zdll.lib
diff --git a/compat/zlib/win32/zlib1.rc b/compat/zlib/win32/zlib1.rc
index 5c0feed..234e641 100644
--- a/compat/zlib/win32/zlib1.rc
+++ b/compat/zlib/win32/zlib1.rc
@@ -26,7 +26,7 @@ BEGIN
       VALUE "FileDescription",	"zlib data compression library\0"
       VALUE "FileVersion",	ZLIB_VERSION "\0"
       VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright",	"(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename",	"zlib1.dll\0"
       VALUE "ProductName",	"zlib\0"
       VALUE "ProductVersion",	ZLIB_VERSION "\0"