zlib 0.94v0.94

5 files changed, 106 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 2d0cdc75..d9e11c5a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ CFLAGS=-O
 #use -O3 for gcc to take advantage of inlining
 #CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 #CFLAGS=-g -DDEBUG
-LDFLAGS=-L. -lgz
+LDFLAGS=-L. -lz
 
 RANLIB=ranlib
 
@@ -24,33 +24,34 @@ test: all
         ./example
         echo hello world | ./minigzip | ./minigzip -d 
 
-install: libgz.a
+install: libz.a
         -@mkdir $(prefix)/include
         -@mkdir $(prefix)/lib
         cp zlib.h zconf.h $(prefix)/include
         chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-        cp libgz.a $(prefix)/lib
-        chmod 644 $(prefix)/lib/libgz.a
+        cp libz.a $(prefix)/lib
+        chmod 644 $(prefix)/lib/libz.a
 
-libgz.a: $(OBJS)
+libz.a: $(OBJS)
         ar rc $@ $(OBJS)
         $(RANLIB) $@
 
-example: example.o libgz.a
+example: example.o libz.a
         $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 
-minigzip: minigzip.o libgz.a
+minigzip: minigzip.o libz.a
         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
 clean:
-        rm -f *.o example minigzip libgz.a foo.gz
+        rm -f *.o example minigzip libz.a foo.gz
 
 zip:
-        zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+        zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
+          descrip.mms *.[ch]
 
 tgz:
         cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
-                zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+          zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
diff --git a/Makefile.bor b/Makefile.bor
index 732ea5dd..3a823d0a 100644
--- a/Makefile.bor
+++ b/Makefile.bor
@@ -4,9 +4,11 @@
 # To use, do "make -fmakefile.bor"
 
 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
-# requirements (default 256K for big objects plus a few K), you can add
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C++, Borland C++ -------------
@@ -83,6 +85,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+        del zlib.lib
         $(LIB) zlib +$(OBJP1)
         $(LIB) zlib +$(OBJP2)
 
diff --git a/Makefile.msc b/Makefile.msc
index d6899d82..335a4e1b 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -3,10 +3,9 @@
 
 # To use, do "make makefile.msc"
 
-# WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
-# requirements (default 256K for big objects plus a few K), you can add
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Microsoft C 5.1 and later -------------
@@ -80,6 +79,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+        del zlib.lib
         lib zlib $(OBJ1);
         lib zlib $(OBJ2);
 
diff --git a/Makefile.qnx b/Makefile.qnx
new file mode 100644
index 00000000..22b1a234
--- /dev/null
+++ b/Makefile.qnx
@@ -0,0 +1,75 @@
+# Makefile for zlib
+# Copyright (C) 1995 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h 
+
+# Modified slightly for QNX by Chris Herborth (chrish@qnx.com)
+
+CC=cc
+CFLAGS=-4 -O -Q
+#use -O3 for gcc to take advantage of inlining
+#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+#CFLAGS=-g -DDEBUG
+LDFLAGS=-L. -lz
+
+#RANLIB=ranlib
+
+prefix=/usr/local
+
+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 minigzip
+
+test: all
+        ./example
+        echo hello world | ./minigzip | ./minigzip -d 
+
+install: zlib.lib
+        -@mkdir $(prefix)/include
+        -@mkdir $(prefix)/lib
+        cp zlib.h zconf.h $(prefix)/include
+        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+        cp zlib.lib $(prefix)/lib
+        chmod 644 $(prefix)/lib/zlib.lib
+
+zlib.lib: $(OBJS)
+        cc -A $@ $(OBJS)
+#       ar rc $@ $(OBJS)
+#       $(RANLIB) $@
+
+example: example.o zlib.lib
+        $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+
+minigzip: minigzip.o zlib.lib
+        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+
+clean:
+        rm -f *.o example minigzip zlib.lib foo.gz
+
+zip:
+        zip -ul9 zlib README ChangeLog Makefile Makefile.??? Makefile.?? *.[ch]
+
+tgz:
+        cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+                zlib/Makefile.??? zlib/Makefile.?? zlib/*.[ch]
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o: zutil.h zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: zutil.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
+infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h infblock.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h
diff --git a/Makefile.tc b/Makefile.tc
index e173a559..ceed87dc 100644
--- a/Makefile.tc
+++ b/Makefile.tc
@@ -4,18 +4,20 @@
 # To use, do "make -fmakefile.tc"
 
 # WARNING: the small model is supported but only for small values of
-# MAX_WBITS and MAX_MEM_LEVEL. If you wish to reduce the memory
-# requirements (default 256K for big objects plus a few K), you can add
-# to CFLAGS below: -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
+# MAX_WBITS and MAX_MEM_LEVEL. For example:
+#    -DMAX_WBITS=11 -DDEF_WBITS=11 -DMAX_MEM_LEVEL=3
+# If you wish to reduce the memory requirements (default 256K for big
+# objects plus a few K), you can add to CFLAGS below: 
+#   -DMAX_MEM_LEVEL=7 -DMAX_WBITS=14
 # See zconf.h for details about the memory requirements.
 
 # ------------- Turbo C 2.0 -------------
 MODEL=-ml
-CFLAGS=-O2 -Z $(MODEL)
-CC=tcc
-LD=tcc
+CFLAGS=-O2 -G -Z $(MODEL)
+CC=tcc -I\tc\include
+LD=tcc -L\tc\lib
 LIB=tlib
-LDFLAGS=$(MODEL)
+LDFLAGS=$(MODEL) -f-
 O=.obj
 
 # variables
@@ -82,6 +84,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 zlib.lib: $(OBJ1) $(OBJ2)
+        del zlib.lib
         $(LIB) zlib +$(OBJP1)
         $(LIB) zlib +$(OBJP2)