zlib 1.2.0.5v1.2.0.5

5 files changed, 130 insertions, 20 deletions

diff --git a/msdos/Makefile.bor b/msdos/Makefile.bor
index 4ad4061..8f8132d 100644
--- a/msdos/Makefile.bor
+++ b/msdos/Makefile.bor
@@ -1,6 +1,6 @@
 # Makefile for zlib
 # Borland C++
-# Updated for zlib-1.2.x by Cosmin Truta, 15-Mar-2003.
+# Last updated: 15-Mar-2003
 
 # To use, do "make -fmakefile.bor"
 # To compile in small model, set below: MODEL=s
@@ -103,7 +103,7 @@ test: example.exe minigzip.exe
 
 clean:
         -del *.obj
-        -del *.exe
         -del *.lib
-        -del zlib_$(MODEL).bak
+        -del *.exe
+        -del zlib_*.bak
         -del foo.gz
diff --git a/old/msdos/Makefile.dj2 b/msdos/Makefile.dj2
index 0ab431c..283d1d9 100644
--- a/old/msdos/Makefile.dj2
+++ b/msdos/Makefile.dj2
@@ -1,15 +1,15 @@
 # Makefile for zlib.  Modified for djgpp v2.0 by F. J. Donahoe, 3/15/96.
 # Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h 
+# For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile, or to compile and test, type:
-# 
+#
 #   make -fmakefile.dj2;  make test -fmakefile.dj2
-# 
+#
 # To install libz.a, zconf.h and zlib.h in the djgpp directories, type:
-# 
+#
 #    make install -fmakefile.dj2
-# 
+#
 # after first defining LIBRARY_PATH and INCLUDE_PATH in djgpp.env as
 # in the sample below if the pattern of the DJGPP distribution is to
 # be followed.  Remember that, while <sp>'es around <=> are ignored in
@@ -52,21 +52,25 @@ prefix=/usr/local
 exec_prefix = $(prefix)
 
 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+       zutil.o inflate.o infback.o inftrees.o inffast.o
+
+OBJA =
+# to use the asm code: make OBJA=match.o
 
 TEST_OBJS = example.o minigzip.o
 
 all: example.exe minigzip.exe
 
+check: test
 test: all
         ./example
-        echo hello world | .\minigzip | .\minigzip -d 
+        echo hello world | .\minigzip | .\minigzip -d
 
 %.o : %.c
         $(CC) $(CFLAGS) -c $< -o $@
 
-libz.a: $(OBJS)
-        $(AR) $@ $(OBJS)
+libz.a: $(OBJS) $(OBJA)
+        $(AR) $@ $(OBJS) $(OBJA)
 
 %.exe : %.o $(LIBS)
         $(LD) $@ $< $(LDLIBS)
diff --git a/old/msdos/Makefile.emx b/msdos/Makefile.emx
index 0e5e5cc..ed4c31f 100644
--- a/old/msdos/Makefile.emx
+++ b/msdos/Makefile.emx
@@ -1,11 +1,11 @@
 # Makefile for zlib.  Modified for emx 0.9c by Chr. Spieler, 6/17/98.
 # Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h 
+# For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile, or to compile and test, type:
-# 
+#
 #   make -fmakefile.emx;  make test -fmakefile.emx
-# 
+#
 
 CC=gcc
 
@@ -34,7 +34,7 @@ prefix=/usr/local
 exec_prefix = $(prefix)
 
 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-       zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
+       zutil.o inflate.o infback.o inftrees.o inffast.o
 
 TEST_OBJS = example.o minigzip.o
 
@@ -42,7 +42,7 @@ all: example.exe minigzip.exe
 
 test: all
         ./example
-        echo hello world | .\minigzip | .\minigzip -d 
+        echo hello world | .\minigzip | .\minigzip -d
 
 %.o : %.c
         $(CC) $(CFLAGS) -c $< -o $@
diff --git a/msdos/Makefile.msc b/msdos/Makefile.msc
new file mode 100644
index 0000000..b8fc665
--- /dev/null
+++ b/msdos/Makefile.msc
@@ -0,0 +1,106 @@
+# Makefile for zlib
+# Microsoft C 5.1 or later
+# Last updated: 19-Mar-2003
+
+# To use, do "make makefile.msc"
+# To compile in small model, set below: MODEL=S
+
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to the LOC macro below:
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# See zconf.h for details about the memory requirements.
+
+# ------------- Microsoft C 5.1 and later -------------
+
+#    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)
+
+# Type for CPU required: 0: 8086, 1: 80186, 2: 80286, 3: 80386, etc.
+CPU_TYP = 0
+
+# Memory model: one of S, M, C, L (small, medium, compact, large)
+MODEL=L
+
+CC=cl
+CFLAGS=-nologo -A$(MODEL) -G$(CPU_TYP) -W3 -Oait -Gs $(LOC)
+#-Ox generates bad code with MSC 5.1
+LIB_CFLAGS=-Zl $(CFLAGS)
+
+LD=link
+LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode
+# "/farcall/packcode" are only useful for `large code' memory models
+# but should be a "no-op" for small code models.
+
+
+# variables
+ZLIB_LIB = zlib_$(MODEL).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
+
+
+# targets
+all:  $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+        $(CC) -c $(LIB_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
+        $(CC) -c $(CFLAGS) $*.c
+
+minigzip.obj: minigzip.c zlib.h zconf.h
+        $(CC) -c $(CFLAGS) $*.c
+
+
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+        if exist $(ZLIB_LIB) del $(ZLIB_LIB)
+        lib $(ZLIB_LIB) $(OBJ1);
+        lib $(ZLIB_LIB) $(OBJ2);
+
+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 *.lib
+        -del *.exe
+        -del *.map
+        -del zlib_*.bak
+        -del foo.gz
diff --git a/msdos/Makefile.tc b/msdos/Makefile.tc
index d0a7864..480750a 100644
--- a/msdos/Makefile.tc
+++ b/msdos/Makefile.tc
@@ -1,6 +1,6 @@
 # Makefile for zlib
 # Turbo C 2.01, Turbo C++ 1.01
-# Updated for zlib-1.2.x by Cosmin Truta, 15-Mar-2003.
+# Last updated: 15-Mar-2003
 
 # To use, do "make -fmakefile.tc"
 # To compile in small model, set below: MODEL=s
@@ -88,7 +88,7 @@ test: example.exe minigzip.exe
 
 clean:
         -del *.obj
-        -del *.exe
         -del *.lib
-        -del zlib_$(MODEL).bak
+        -del *.exe
+        -del zlib_*.bak
         -del foo.gz