From 13a294f044ef0a89b2dcbfbb5d4d4c792673348e Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:21:57 -0700 Subject: zlib 1.2.0.1 --- win32/Makefile-dll.msc | 76 +++++++++++++++++++++++++++++++++++ win32/Makefile.bor | 91 ++++++++++++++++++++++++++++++++++++++++++ win32/Makefile.gcc | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ win32/Makefile.msc | 69 ++++++++++++++++++++++++++++++++ win32/zlib.def | 49 +++++++++++++++++++++++ 5 files changed, 390 insertions(+) create mode 100644 win32/Makefile-dll.msc create mode 100644 win32/Makefile.bor create mode 100644 win32/Makefile.gcc create mode 100644 win32/Makefile.msc create mode 100644 win32/zlib.def (limited to 'win32') diff --git a/win32/Makefile-dll.msc b/win32/Makefile-dll.msc new file mode 100644 index 0000000..516f4cf --- /dev/null +++ b/win32/Makefile-dll.msc @@ -0,0 +1,76 @@ +# Makefile for zlib.dll -- Microsoft (Visual) C. +# Author: Cosmin Truta, 11-Mar-2003. +# +# Usage: nmake -f win32/Makefile-dll.msc + +CC = cl +LD = cl +CFLAGS = -nologo -MD -O2 +LDFLAGS = -nologo + +OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj \ + inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + +# targets +all: zlib.dll zlib.lib example.exe minigzip.exe + +zlib.lib: $(OBJS) + lib -out:$@ $(OBJS) + +zlib.dll: $(OBJS) win32/zlib.def + link -release -def:win32/zlib.def -dll -out:$@ $(OBJS) + +zlib.lib: zlib.dll + +example.exe: example.obj zlib.lib + $(LD) $(LDFLAGS) example.obj zlib.lib + +minigzip.exe: minigzip.obj zlib.lib + $(LD) $(LDFLAGS) minigzip.obj zlib.lib + +.c.obj: + $(CC) -c $(CFLAGS) $*.c + +adler32.obj: adler32.c zlib.h zconf.h + +compress.obj: compress.c zlib.h zconf.h + +crc32.obj: crc32.c zlib.h zconf.h crc32.h + +deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + +gzio.obj: gzio.c zutil.h zlib.h zconf.h + +infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + +inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + +inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + +inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + +trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + +uncompr.obj: uncompr.c zlib.h zconf.h + +zutil.obj: zutil.c zutil.h zlib.h zconf.h + +example.obj: example.c zlib.h zconf.h + +minigzip.obj: minigzip.c zlib.h zconf.h + +# testing +test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + +# cleanup +clean: + del *.obj + del *.dll + del *.lib + del *.exp + del *.exe diff --git a/win32/Makefile.bor b/win32/Makefile.bor new file mode 100644 index 0000000..f1a1c46 --- /dev/null +++ b/win32/Makefile.bor @@ -0,0 +1,91 @@ +# Makefile for zlib +# Borland C++ for Win32 +# Updated for zlib-1.2.x by Cosmin Truta, 11-Mar-2003. + +# Usage: "make -f win32/makefile.bor" + +# ------------ Borland C++ for Win32 ------------ + +# Optional nonstandard preprocessor flags (e.g. -DMAX_MEM_LEVEL=7) +# should be added to the environment via "set LOCAL_ZLIB=-DFOO" or added +# to the declaration of LOC here: +LOC = $(LOCAL_ZLIB) + +CC = bcc32 +LD = bcc32 +AR = tlib +CFLAGS = -O2 -d -k- $(LOC) +LDFLAGS = $(LOC) + + +# variables +ZLIB_LIB = zlib.lib + +OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj +OBJ2 = inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj +OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzio.obj+infback.obj +OBJP2 = +inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj + + +# targets +all: $(ZLIB_LIB) example.exe minigzip.exe + +.c.obj: + $(CC) -c $(CFLAGS) $*.c + +adler32.obj: adler32.c zlib.h zconf.h + +compress.obj: compress.c zlib.h zconf.h + +crc32.obj: crc32.c zlib.h zconf.h crc32.h + +deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + +gzio.obj: gzio.c zutil.h zlib.h zconf.h + +infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + +inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + +inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + +inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + +trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + +uncompr.obj: uncompr.c zlib.h zconf.h + +zutil.obj: zutil.c zutil.h zlib.h zconf.h + +example.obj: example.c zlib.h zconf.h + +minigzip.obj: minigzip.c zlib.h zconf.h + + +# For the sake of the old Borland make, +# the command line is cut to fit in the MS-DOS 128 byte limit: +$(ZLIB_LIB): $(OBJ1) $(OBJ2) + -del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) $(OBJP1) + $(AR) $(ZLIB_LIB) $(OBJP2) + +example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) + +minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) + +test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + +clean: + -del *.obj + -del *.exe + -del *.lib + -del *.tds + -del zlib.bak + -del foo.gz diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc new file mode 100644 index 0000000..7f9973b --- /dev/null +++ b/win32/Makefile.gcc @@ -0,0 +1,105 @@ +# Makefile for zlib, derived from Makefile.dj2. +# Modified for mingw32 by C. Spieler, 6/16/98. +# Updated for zlib-1.2.x by Cosmin Truta, 11-Mar-2003. +# Tested under Cygwin and MinGW. + +# Copyright (C) 1995-1998 Jean-loup Gailly. +# For conditions of distribution and use, see copyright notice in zlib.h + +# To compile, or to compile and test, type: +# +# make -fmakefile.gcc; make test -fmakefile.gcc +# +# To install libz.a, zconf.h and zlib.h in the system directories, type: +# +# make install -fmakefile.gcc +# + +LIB = libz.a +SHAREDLIB = libz.so +VER = 1.2.0 + +CC = gcc +#CFLAGS = -DDEBUG -MMD -g +CFLAGS = $(LOC) -O3 -Wall + +AS = $(CC) +ASFLAGS = $(LOC) -Wall + +LD = $(CC) +LDFLAGS = $(LOC) -s + +AR = ar +ARFLAGS = rcs + +CP = cp -fp +# If GNU install is available, replace $(CP) with install. +INSTALL = $(CP) +RM = rm -f + +prefix = /usr/local +exec_prefix = $(prefix) + +OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \ + inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o + +# to use the asm code: make OBJA=match.o +OBJA = + +TEST_OBJS = example.o minigzip.o + +all: $(LIB) example minigzip + +test: all + ./example + echo hello world | ./minigzip | ./minigzip -d + +.c.o: + $(CC) $(CFLAGS) -c -o $@ $< + +libz.a: $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) + +example: example.o $(LIB) + $(LD) -o $@ $< $(LIB) + +minigzip: minigzip.o $(LIB) + $(LD) -o $@ $< $(LIB) + + +# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env . + +.PHONY : uninstall clean + +install: zlib.h zconf.h $(LIB) + -@if not exist $(INCLUDE_PATH)/nul mkdir $(INCLUDE_PATH) + -@if not exist $(LIBRARY_PATH)/nul mkdir $(LIBRARY_PATH) + $(INSTALL) zlib.h $(INCLUDE_PATH) + $(INSTALL) zconf.h $(INCLUDE_PATH) + $(INSTALL) $(LIB) $(LIBRARY_PATH) + +uninstall: + $(RM) $(INCLUDE_PATH)/zlib.h + $(RM) $(INCLUDE_PATH)/zconf.h + $(RM) $(LIBRARY_PATH)/libz.a + +clean: + $(RM) *.o + $(RM) *.exe + $(RM) libz.a + $(RM) foo.gz + +adler32.o: zlib.h zconf.h +compress.o: zlib.h zconf.h +crc32.o: crc32.h zlib.h zconf.h +deflate.o: deflate.h zutil.h zlib.h zconf.h +example.o: zlib.h zconf.h +gzio.o: zutil.h zlib.h zconf.h +inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h +inftrees.o: zutil.h zlib.h zconf.h inftrees.h +minigzip.o: zlib.h zconf.h +trees.o: deflate.h zutil.h zlib.h zconf.h trees.h +uncompr.o: zlib.h zconf.h +zutil.o: zutil.h zlib.h zconf.h diff --git a/win32/Makefile.msc b/win32/Makefile.msc new file mode 100644 index 0000000..9760208 --- /dev/null +++ b/win32/Makefile.msc @@ -0,0 +1,69 @@ +# Makefile for (static) zlib -- Microsoft (Visual) C. +# Author: Cosmin Truta, 11-Mar-2003. +# +# Usage: nmake -f win32/Makefile.msc + +CC = cl +LD = cl +CFLAGS = -nologo -MD -O2 +LDFLAGS = -nologo + +OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzio.obj infback.obj \ + inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj + +# targets +all: zlib.lib example.exe minigzip.exe + +zlib.lib: $(OBJS) + lib -out:$@ $(OBJS) + +example.exe: example.obj zlib.lib + $(LD) $(LDFLAGS) example.obj zlib.lib + +minigzip.exe: minigzip.obj zlib.lib + $(LD) $(LDFLAGS) minigzip.obj zlib.lib + +.c.obj: + $(CC) -c $(CFLAGS) $*.c + +adler32.obj: adler32.c zlib.h zconf.h + +compress.obj: compress.c zlib.h zconf.h + +crc32.obj: crc32.c zlib.h zconf.h crc32.h + +deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h + +gzio.obj: gzio.c zutil.h zlib.h zconf.h + +infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + +inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h + +inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ + inffast.h inffixed.h + +inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h + +trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h + +uncompr.obj: uncompr.c zlib.h zconf.h + +zutil.obj: zutil.c zutil.h zlib.h zconf.h + +example.obj: example.c zlib.h zconf.h + +minigzip.obj: minigzip.c zlib.h zconf.h + +# testing +test: example.exe minigzip.exe + example + echo hello world | minigzip | minigzip -d + +# cleanup +clean: + del *.obj + del *.lib + del *.exe diff --git a/win32/zlib.def b/win32/zlib.def new file mode 100644 index 0000000..3b4b05a --- /dev/null +++ b/win32/zlib.def @@ -0,0 +1,49 @@ +LIBRARY zlib.dll +DESCRIPTION "zlib compression library for Windows" + +EXPORTS + adler32 @1 + compress @2 + crc32 @3 + deflate @4 + deflateCopy @5 + deflateEnd @6 + deflateInit2_ @7 + deflateInit_ @8 + deflateParams @9 + deflateReset @10 + deflateSetDictionary @11 + gzclose @12 + gzdopen @13 + gzerror @14 + gzflush @15 + gzopen @16 + gzread @17 + gzwrite @18 + inflate @19 + inflateEnd @20 + inflateInit2_ @21 + inflateInit_ @22 + inflateReset @23 + inflateSetDictionary @24 + inflateSync @25 + uncompress @26 + zlibVersion @27 + gzprintf @28 + gzputc @29 + gzgetc @30 + gzseek @31 + gzrewind @32 + gztell @33 + gzeof @34 + gzsetparams @35 + zError @36 + inflateSyncPoint @37 + get_crc_table @38 + compress2 @39 + gzputs @40 + gzgets @41 +; The following functions exist since zlib-1.2.0 +; deflateBound @42 +; compressBound @43 +; etc. -- cgit v1.2.3-55-g6feb