diff options
Diffstat (limited to '3rdparty/zlib/win32')
-rw-r--r-- | 3rdparty/zlib/win32/DLL_FAQ.txt | 20 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/Makefile.bor | 1 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/Makefile.gcc | 5 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/Makefile.msc | 4 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/README-WIN32.txt | 8 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/zlib.def | 3 | ||||
-rw-r--r-- | 3rdparty/zlib/win32/zlib1.rc | 2 |
7 files changed, 10 insertions, 33 deletions
diff --git a/3rdparty/zlib/win32/DLL_FAQ.txt b/3rdparty/zlib/win32/DLL_FAQ.txt index 12c009018c3..d8cf5f31e3d 100644 --- a/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/3rdparty/zlib/win32/DLL_FAQ.txt @@ -3,7 +3,7 @@ This document describes the design, the rationale, and the usage -of the official DLL build of zlib, named ZLIB1.DLL. If you have +of the common DLL build of zlib, named ZLIB1.DLL. If you have general questions about zlib, you should see the file "FAQ" found in the zlib distribution, or at the following location: http://www.gzip.org/zlib/zlib_faq.html @@ -11,13 +11,9 @@ in the zlib distribution, or at the following location: 1. What is ZLIB1.DLL, and how can I get it? - - ZLIB1.DLL is the official build of zlib as a DLL. + - ZLIB1.DLL is the common build of zlib as a DLL. (Please remark the character '1' in the name.) - Pointers to a precompiled ZLIB1.DLL can be found in the zlib - web site at: - http://www.zlib.net/ - Applications that link to ZLIB1.DLL can rely on the following specification: @@ -379,18 +375,6 @@ in the zlib distribution, or at the following location: code. But you can make your own private DLL build, under a different file name, as suggested in the previous answer. - -17. I made my own ZLIB1.DLL build. Can I test it for compliance? - - - We prefer that you download the official DLL from the zlib - web site. If you need something peculiar from this DLL, you - can send your suggestion to the zlib mailing list. - - However, in case you do rebuild the DLL yourself, you can run - it with the test programs found in the DLL distribution. - Running these test programs is not a guarantee of compliance, - but a failure can imply a detected problem. - ** This document is written and maintained by diff --git a/3rdparty/zlib/win32/Makefile.bor b/3rdparty/zlib/win32/Makefile.bor index d152bbb7ffd..4495353f3f5 100644 --- a/3rdparty/zlib/win32/Makefile.bor +++ b/3rdparty/zlib/win32/Makefile.bor @@ -3,7 +3,6 @@ # # Usage: # make -f win32/Makefile.bor -# make -f win32/Makefile.bor LOCAL_ZLIB=-DASMV OBJA=match.obj OBJPA=+match.obj # ------------ Borland C++ ------------ diff --git a/3rdparty/zlib/win32/Makefile.gcc b/3rdparty/zlib/win32/Makefile.gcc index 305be50afef..081e391eb29 100644 --- a/3rdparty/zlib/win32/Makefile.gcc +++ b/3rdparty/zlib/win32/Makefile.gcc @@ -11,10 +11,6 @@ # # make -fwin32/Makefile.gcc; make test testdll -fwin32/Makefile.gcc # -# To use the asm code, type: -# cp contrib/asm?86/match.S ./match.S -# make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc -# # To install libz.a, zconf.h and zlib.h in the system directories, type: # # make install -fwin32/Makefile.gcc @@ -38,7 +34,6 @@ IMPLIB = libz.dll.a # SHARED_MODE=0 -#LOC = -DASMV #LOC = -DZLIB_DEBUG -g PREFIX = diff --git a/3rdparty/zlib/win32/Makefile.msc b/3rdparty/zlib/win32/Makefile.msc index 6831882de43..9c6515360e6 100644 --- a/3rdparty/zlib/win32/Makefile.msc +++ b/3rdparty/zlib/win32/Makefile.msc @@ -4,10 +4,6 @@ # Usage: # nmake -f win32/Makefile.msc (standard build) # nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build) -# nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \ -# OBJA="inffas32.obj match686.obj" (use ASM code, x86) -# nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \ -# OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" (use ASM code, x64) # The toplevel directory of the source tree. # diff --git a/3rdparty/zlib/win32/README-WIN32.txt b/3rdparty/zlib/win32/README-WIN32.txt index df7ab7f4b34..14e6398ef3a 100644 --- a/3rdparty/zlib/win32/README-WIN32.txt +++ b/3rdparty/zlib/win32/README-WIN32.txt @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.11 is a general purpose data compression library. All the code is +zlib 1.3.1 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) @@ -16,13 +16,13 @@ is http://zlib.net/ . Before reporting a problem, please check this site to verify that you have the latest version of zlib; otherwise get the latest version and check whether the problem still exists or not. -PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html -before asking for help. +PLEASE read DLL_FAQ.txt, and the zlib FAQ http://zlib.net/zlib_faq.html before +asking for help. Manifest: -The package zlib-1.2.11-win32-x86.zip will contain the following files: +The package zlib-1.3.1-win32-x86.zip will contain the following files: README-WIN32.txt This document ChangeLog Changes since previous zlib packages diff --git a/3rdparty/zlib/win32/zlib.def b/3rdparty/zlib/win32/zlib.def index a2188b00062..666bc6fbbb1 100644 --- a/3rdparty/zlib/win32/zlib.def +++ b/3rdparty/zlib/win32/zlib.def @@ -69,6 +69,7 @@ EXPORTS gzoffset64 adler32_combine64 crc32_combine64 + crc32_combine_gen64 ; checksum functions adler32 adler32_z @@ -76,6 +77,8 @@ EXPORTS crc32_z adler32_combine crc32_combine + crc32_combine_gen + crc32_combine_op ; various hacks, don't look :) deflateInit_ deflateInit2_ diff --git a/3rdparty/zlib/win32/zlib1.rc b/3rdparty/zlib/win32/zlib1.rc index 234e641c329..ceb4ee5c69e 100644 --- a/3rdparty/zlib/win32/zlib1.rc +++ b/3rdparty/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-2017 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0" VALUE "OriginalFilename", "zlib1.dll\0" VALUE "ProductName", "zlib\0" VALUE "ProductVersion", ZLIB_VERSION "\0" |