From bfac0d889b3c93d842e33ec66f1f0ef384da3de7 Mon Sep 17 00:00:00 2001 From: nijtmans Date: Thu, 29 Jul 2010 00:46:10 +0000 Subject: Official build of zlib1.dll 1.2.5 is finally available, so put it in --- ChangeLog | 6 +++ compat/zlib/win32/README.txt | 59 ++++++++++++++++++++++++++++ compat/zlib/win32/USAGE.txt | 89 +++++++++++++++++++++++++++++++++++++++++++ compat/zlib/win32/zlib1.dll | Bin 77876 -> 100352 bytes 4 files changed, 154 insertions(+) create mode 100644 compat/zlib/win32/README.txt create mode 100644 compat/zlib/win32/USAGE.txt diff --git a/ChangeLog b/ChangeLog index 207f14c..50d1473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-07-29 Jan Nijtmans + + * compat/zlib/win32/README.txt Official build of zlib1.dll 1.2.5 is + * compat/zlib/win32/USAGE.txt finally available, so put it in. + * compat/zlib/win32/zlib1.dll + 2010-07-25 Donal K. Fellows * doc/http.n: Corrected description of location of one of the entries diff --git a/compat/zlib/win32/README.txt b/compat/zlib/win32/README.txt new file mode 100644 index 0000000..fad9f14 --- /dev/null +++ b/compat/zlib/win32/README.txt @@ -0,0 +1,59 @@ + +What's here +=========== + The official ZLIB1.DLL + + +Source +====== + zlib version 1.2.5 + available at http://www.gzip.org/zlib/ + + +Specification and rationale +=========================== + See the accompanying DLL_FAQ.txt + + +Usage +===== + See the accompanying USAGE.txt + + +Build info +========== + Contributed by Cosmin Truta. + + Compiler: + gcc-4.5.0-1-mingw32 + Library: + mingwrt-3.17, w32api-3.14 + Build commands: + gcc -c -DASMV contrib/asm686/match.S + gcc -c -DASMINF -I. -O3 contrib/inflate86/inffas86.c + make -f win32/Makefile.gcc LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o" + + +Copyright notice +================ + Copyright (C) 1995-2010 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 + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly Mark Adler + jloup@gzip.org madler@alumni.caltech.edu + diff --git a/compat/zlib/win32/USAGE.txt b/compat/zlib/win32/USAGE.txt new file mode 100644 index 0000000..48e594e --- /dev/null +++ b/compat/zlib/win32/USAGE.txt @@ -0,0 +1,89 @@ + +Installing ZLIB1.DLL +==================== + Copy ZLIB1.DLL to the SYSTEM or the SYSTEM32 directory. + + +Using ZLIB1.DLL with Microsoft Visual C++ +========================================= + 1. Install the supplied header files "zlib.h" and "zconf.h" + into a directory found in the INCLUDE path list. + + 2. Install the supplied library file "zdll.lib" into a + directory found in the LIB path list. + + 3. Add "zdll.lib" to your project. + + +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": + cp lib/zdll.lib 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. + + 4. Add "libzdll.a" to your project, or use the -lzdll option. + + +Using ZLIB1.DLL with gcc/Cygwin +=============================== + ZLIB1.DLL is not designed to work with Cygwin. The Cygwin + system has its own DLL build of zlib, named CYGZ.DLL. + + +Using ZLIB1.DLL with Borland C++ +================================ + 1. Install the supplied header files "zlib.h" and "zconf.h" + into a directory found in the INCLUDE path list. + + 2. Build the import library using the IMPLIB tool: + implib -a -c -f lib\zdllbor.lib zlib1.dll + + OR + + 2' Convert the supplied library file "zdll.lib" to OMF format, + using the COFF2OMF tool: + coff2omf lib\zdll.lib lib\zdllbor.lib + + 3. Install "zdllbor.lib" into a directory found in the LIB path + list. + + 4. Add "zdllbor.lib" to your project. + + Notes: + - The modules that are linked with "zdllbor.lib" must be compiled + using a 4-byte alignment (option -a): + bcc32 -a -c myprog.c + bcc32 myprog.obj zdllbor.lib + - If you wish, you may use "zlib1.lib" instead of "zdllbor.lib". + + +Rebuilding ZLIB1.DLL +==================== + Depending on your build environment, use the appropriate + makefile from the win32/ directory, found in the zlib source + distribution. + + Your custom build has to comply with the requirements stated + in DLL_FAQ.txt, including (but not limited to) the following: + - It must be built from an unaltered zlib source distribution. + - It must be linked to MSVCRT.DLL. + - The macros that compile out certain portions of the zlib + code (such as NO_GZCOMPRESS, NO_GZIP) must not be enabled. + - The ZLIB_WINAPI macro must not be enabled. + + Furthermore, it has to run successfully with the test suite + found in this package. + + It is recommended, however, to use the supplied ZLIB1.DLL, + instead of rebuilding it yourself. You should rebuild it + only if you have a special reason. + diff --git a/compat/zlib/win32/zlib1.dll b/compat/zlib/win32/zlib1.dll index bfc3ba9..869b00d 100644 Binary files a/compat/zlib/win32/zlib1.dll and b/compat/zlib/win32/zlib1.dll differ -- cgit v0.12