zlib 1.2.0.5v1.2.0.5

4 files changed, 13 insertions, 304 deletions

diff --git a/old/nt/Makefile.emx b/old/nt/Makefile.emx
deleted file mode 100644
index 2d475b1..0000000
--- a/old/nt/Makefile.emx
+++ /dev/null
@@ -1,138 +0,0 @@
-# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.
-# 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.emx;  make test -fmakefile.emx
-# 
-
-CC=gcc -Zwin32
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DDEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lzlib
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=zlib.a
-
-AR=ar rcs
-
-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
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-test: all
-        ./example
-        echo hello world | .\minigzip | .\minigzip -d 
-
-%.o : %.c
-        $(CC) $(CFLAGS) -c $< -o $@
-
-zlib.a: $(OBJS)
-        $(AR) $@ $(OBJS)
-
-%.exe : %.o $(LIBS)
-        $(LD) $@ $< $(LDLIBS)
-
-
-.PHONY : clean
-
-clean:
-        $(RM) *.d
-        $(RM) *.o
-        $(RM) *.exe
-        $(RM) zlib.a
-        $(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif
-# 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 
-
-# To compile, or to compile and test, type:
-# 
-#   make -fmakefile.emx;  make test -fmakefile.emx
-# 
-
-CC=gcc
-
-#CFLAGS=-MMD -O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-MMD -g -DDEBUG
-CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-             -Wstrict-prototypes -Wmissing-prototypes
-
-# If cp.exe is available, replace "copy /Y" with "cp -fp" .
-CP=copy /Y
-# If gnu install.exe is available, replace $(CP) with ginstall.
-INSTALL=$(CP)
-# The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
-RM=del
-LDLIBS=-L. -lzlib
-LD=$(CC) -s -o
-LDSHARED=$(CC)
-
-INCL=zlib.h zconf.h
-LIBS=zlib.a
-
-AR=ar rcs
-
-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
-
-TEST_OBJS = example.o minigzip.o
-
-all: example.exe minigzip.exe
-
-test: all
-        ./example
-        echo hello world | .\minigzip | .\minigzip -d 
-
-%.o : %.c
-        $(CC) $(CFLAGS) -c $< -o $@
-
-zlib.a: $(OBJS)
-        $(AR) $@ $(OBJS)
-
-%.exe : %.o $(LIBS)
-        $(LD) $@ $< $(LDLIBS)
-
-
-.PHONY : clean
-
-clean:
-        $(RM) *.d
-        $(RM) *.o
-        $(RM) *.exe
-        $(RM) zlib.a
-        $(RM) foo.gz
-
-DEPS := $(wildcard *.d)
-ifneq ($(DEPS),)
-include $(DEPS)
-endif
diff --git a/old/nt/Makefile.nt b/old/nt/Makefile.nt
deleted file mode 100644
index b250f2a..0000000
--- a/old/nt/Makefile.nt
+++ /dev/null
@@ -1,88 +0,0 @@
-# Makefile for zlib
-
-!include <ntwin32.mak>
-
-CC=cl
-LD=link
-CFLAGS=-O -nologo
-LDFLAGS=
-O=.obj
-
-# variables
-OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
-  trees$(O)
-OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
-  infutil$(O) inffast$(O)
-
-all:  zlib.dll example.exe minigzip.exe
-
-adler32.obj: adler32.c zutil.h zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-compress.obj: compress.c zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-crc32.obj: crc32.c zutil.h zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-gzio.obj: gzio.c zutil.h zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\
-   infcodes.h infutil.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\
-   infcodes.h inffast.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-example.obj: example.c zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-minigzip.obj: minigzip.c zlib.h zconf.h
-        $(CC) -c $(cvarsdll) $(CFLAGS) $*.c
-
-zlib.dll: $(OBJ1) $(OBJ2) zlib.dnt
-        link $(dlllflags) -out:$@ -def:zlib.dnt $(OBJ1) $(OBJ2) $(guilibsdll)
-
-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
-
-test: example.exe minigzip.exe
-        example
-        echo hello world | minigzip | minigzip -d 
-
-clean:
-        del *.obj
-        del *.exe
-        del *.dll
-        del *.lib
diff --git a/old/nt/zlib.dnt b/old/nt/zlib.dnt
deleted file mode 100644
index 7f9475c..0000000
--- a/old/nt/zlib.dnt
+++ /dev/null
@@ -1,47 +0,0 @@
-LIBRARY         zlib.dll
-EXETYPE WINDOWS
-CODE             PRELOAD MOVEABLE DISCARDABLE
-DATA             PRELOAD MOVEABLE MULTIPLE
-
-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
diff --git a/old/nt/Makefile.gcc b/win32/Makefile.emx
index cdd652f..7b08424 100644
--- a/old/nt/Makefile.gcc
+++ b/win32/Makefile.emx
@@ -1,18 +1,13 @@
-# Makefile for zlib.  Modified for mingw32 by C. Spieler, 6/16/98.
-# (This Makefile is directly derived from Makefile.dj2)
+# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/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.gcc;  make test -fmakefile.gcc
-# 
-# To install libz.a, zconf.h and zlib.h in the mingw32 directories, type:
-# 
-#    make install -fmakefile.gcc
-# 
+#
+#   make -fmakefile.emx;  make test -fmakefile.emx
+#
 
-CC=gcc
+CC=gcc -Zwin32
 
 #CFLAGS=-MMD -O
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
@@ -26,12 +21,12 @@ CP=copy /Y
 INSTALL=$(CP)
 # The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
 RM=del
-LDLIBS=-L. -lz
+LDLIBS=-L. -lzlib
 LD=$(CC) -s -o
 LDSHARED=$(CC)
 
 INCL=zlib.h zconf.h
-LIBS=libz.a
+LIBS=zlib.a
 
 AR=ar rcs
 
@@ -39,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
 
@@ -47,38 +42,25 @@ 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 $@
 
-libz.a: $(OBJS)
+zlib.a: $(OBJS)
         $(AR) $@ $(OBJS)
 
 %.exe : %.o $(LIBS)
         $(LD) $@ $< $(LDLIBS)
 
-# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
 
-.PHONY : uninstall clean
-
-install: $(INCL) $(LIBS)
-        -@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) libz.a $(LIBRARY_PATH)
-
-uninstall:
-        $(RM) $(INCLUDE_PATH)\zlib.h
-        $(RM) $(INCLUDE_PATH)\zconf.h
-        $(RM) $(LIBRARY_PATH)\libz.a
+.PHONY : clean
 
 clean:
         $(RM) *.d
         $(RM) *.o
         $(RM) *.exe
-        $(RM) libz.a
+        $(RM) zlib.a
         $(RM) foo.gz
 
 DEPS := $(wildcard *.d)