From 14763ac7c6c03bca62c39e35c03cf5bfc7728802 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:20:29 -0700 Subject: zlib 1.1.3 --- msdos/Makefile.b32 | 4 +- msdos/Makefile.bor | 86 ++++++++++++++++++++++++---------------- msdos/Makefile.emx | 69 ++++++++++++++++++++++++++++++++ msdos/Makefile.msc | 114 +++++++++++++++++++++++++++++++---------------------- msdos/Makefile.tc | 67 ++++++++++++++++--------------- msdos/Makefile.w32 | 4 +- msdos/Makefile.wat | 4 +- msdos/zlib.def | 2 +- msdos/zlib.rc | 6 +-- 9 files changed, 234 insertions(+), 122 deletions(-) create mode 100644 msdos/Makefile.emx (limited to 'msdos') diff --git a/msdos/Makefile.b32 b/msdos/Makefile.b32 index fc3ac68..f476da9 100644 --- a/msdos/Makefile.b32 +++ b/msdos/Makefile.b32 @@ -33,13 +33,13 @@ OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\ all: test -adler32.obj: adler32.c zutil.h zlib.h zconf.h +adler32.obj: adler32.c zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c compress.obj: compress.c zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c -crc32.obj: crc32.c zutil.h zlib.h zconf.h +crc32.obj: crc32.c zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h diff --git a/msdos/Makefile.bor b/msdos/Makefile.bor index 2116563..f5651b4 100644 --- a/msdos/Makefile.bor +++ b/msdos/Makefile.bor @@ -2,24 +2,40 @@ # Borland C++ ************ UNTESTED *********** # To use, do "make -fmakefile.bor" -# To compile in small model, set below: MODEL=-ms +# To compile in small model, set below: MODEL=s # WARNING: the small model is supported but only for small values of # 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: +# 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. # ------------- Turbo C++, Borland C++ ------------- -MODEL=-ml -CFLAGS=-O2 -Z $(MODEL) + +# 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=bcc -LD=bcc -LIB=tlib # replace bcc with tcc for Turbo C++ 1.0, with bcc32 for the 32 bit version -LDFLAGS=$(MODEL) +LD=$(CC) +AR=tlib + +# compiler flags +CFLAGS=-O2 -Z -m$(MODEL) $(LOC) +# replace "-O2" by "-O -G -a -d" for Turbo C++ 1.0 + +LDFLAGS=-m$(MODEL) + O=.obj # variables @@ -32,69 +48,73 @@ OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\ infutil$(O)+inffast$(O) +ZLIB_H = zlib.h zconf.h +ZUTIL_H = zutil.h $(ZLIB_H) + +ZLIB_LIB = zlib_$(MODEL).lib + all: test -adler32.obj: adler32.c zutil.h zlib.h zconf.h +# individual dependencies and action rules: +adler32.obj: adler32.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -compress.obj: compress.c zlib.h zconf.h +compress.obj: compress.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -crc32.obj: crc32.c zutil.h zlib.h zconf.h +crc32.obj: crc32.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h +deflate.obj: deflate.c deflate.h $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -gzio.obj: gzio.c zutil.h zlib.h zconf.h +gzio.obj: gzio.c $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\ - infcodes.h infutil.h +infblock.obj: infblock.c $(ZUTIL_H) infblock.h inftrees.h infcodes.h infutil.h $(CC) -c $(CFLAGS) $*.c -infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\ - infcodes.h inffast.h +infcodes.obj: infcodes.c $(ZUTIL_H) inftrees.h infutil.h infcodes.h inffast.h $(CC) -c $(CFLAGS) $*.c -inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h +inflate.obj: inflate.c $(ZUTIL_H) infblock.h $(CC) -c $(CFLAGS) $*.c -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h +inftrees.obj: inftrees.c $(ZUTIL_H) inftrees.h $(CC) -c $(CFLAGS) $*.c -infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h +infutil.obj: infutil.c $(ZUTIL_H) inftrees.h infutil.h $(CC) -c $(CFLAGS) $*.c -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h +inffast.obj: inffast.c $(ZUTIL_H) inftrees.h infutil.h inffast.h $(CC) -c $(CFLAGS) $*.c -trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h +trees.obj: trees.c deflate.h $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -uncompr.obj: uncompr.c zlib.h zconf.h +uncompr.obj: uncompr.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -zutil.obj: zutil.c zutil.h zlib.h zconf.h +zutil.obj: zutil.c $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -example.obj: example.c zlib.h zconf.h +example.obj: example.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -minigzip.obj: minigzip.c zlib.h zconf.h +minigzip.obj: minigzip.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c # 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) +$(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 +example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj $(ZLIB_LIB) -minigzip.exe: minigzip.obj zlib.lib - $(LD) $(LDFLAGS) minigzip.obj zlib.lib +minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB) test: example.exe minigzip.exe example diff --git a/msdos/Makefile.emx b/msdos/Makefile.emx new file mode 100644 index 0000000..0e5e5cc --- /dev/null +++ b/msdos/Makefile.emx @@ -0,0 +1,69 @@ +# 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/msdos/Makefile.msc b/msdos/Makefile.msc index 1a6d663..562201d 100644 --- a/msdos/Makefile.msc +++ b/msdos/Makefile.msc @@ -2,20 +2,36 @@ # Microsoft C 5.1 or later # To use, do "make makefile.msc" -# To compile in small model, set below: MODEL=-AS +# 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 CFLAGS below: +# 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 ------------- -MODEL=-AL -CFLAGS=-Oait -Gs -nologo -W3 $(MODEL) -#-Ox generates bad code with MSC 5.1 + +# 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=/e/st:0x1500/noe +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. + O=.obj # variables @@ -28,69 +44,73 @@ OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\ infutil$(O)+inffast$(O) -all: zlib.lib example.exe minigzip.exe +ZLIB_H = zlib.h zconf.h +ZUTIL_H = zutil.h $(ZLIB_H) -adler32.obj: adler32.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +ZLIB_LIB = zlib_$(MODEL).lib -compress.obj: compress.c zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +all: $(ZLIB_LIB) example.exe minigzip.exe -crc32.obj: crc32.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +# individual dependencies and action rules: +adler32.obj: adler32.c $(ZLIB_H) + $(CC) -c $(LIB_CFLAGS) $*.c -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +compress.obj: compress.c $(ZLIB_H) + $(CC) -c $(LIB_CFLAGS) $*.c -gzio.obj: gzio.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +crc32.obj: crc32.c $(ZLIB_H) + $(CC) -c $(LIB_CFLAGS) $*.c -infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\ - infcodes.h infutil.h - $(CC) -c $(CFLAGS) $*.c +deflate.obj: deflate.c deflate.h $(ZUTIL_H) + $(CC) -c $(LIB_CFLAGS) $*.c -infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\ - infcodes.h inffast.h - $(CC) -c $(CFLAGS) $*.c +gzio.obj: gzio.c $(ZUTIL_H) + $(CC) -c $(LIB_CFLAGS) $*.c -inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h - $(CC) -c $(CFLAGS) $*.c +infblock.obj: infblock.c $(ZUTIL_H) infblock.h inftrees.h infcodes.h infutil.h + $(CC) -c $(LIB_CFLAGS) $*.c -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h - $(CC) -c $(CFLAGS) $*.c +infcodes.obj: infcodes.c $(ZUTIL_H) inftrees.h infutil.h infcodes.h inffast.h + $(CC) -c $(LIB_CFLAGS) $*.c -infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h - $(CC) -c $(CFLAGS) $*.c +inflate.obj: inflate.c $(ZUTIL_H) infblock.h + $(CC) -c $(LIB_CFLAGS) $*.c -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h - $(CC) -c $(CFLAGS) $*.c +inftrees.obj: inftrees.c $(ZUTIL_H) inftrees.h + $(CC) -c $(LIB_CFLAGS) $*.c -trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +infutil.obj: infutil.c $(ZUTIL_H) inftrees.h infutil.h + $(CC) -c $(LIB_CFLAGS) $*.c -uncompr.obj: uncompr.c zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +inffast.obj: inffast.c $(ZUTIL_H) inftrees.h infutil.h inffast.h + $(CC) -c $(LIB_CFLAGS) $*.c -zutil.obj: zutil.c zutil.h zlib.h zconf.h - $(CC) -c $(CFLAGS) $*.c +trees.obj: trees.c deflate.h $(ZUTIL_H) + $(CC) -c $(LIB_CFLAGS) $*.c + +uncompr.obj: uncompr.c $(ZLIB_H) + $(CC) -c $(LIB_CFLAGS) $*.c + +zutil.obj: zutil.c $(ZUTIL_H) + $(CC) -c $(LIB_CFLAGS) $*.c -example.obj: example.c zlib.h zconf.h +example.obj: example.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -minigzip.obj: minigzip.c zlib.h zconf.h +minigzip.obj: minigzip.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c # we must cut the command line to fit in the MS/DOS 128 byte limit: -zlib.lib: $(OBJ1) $(OBJ2) - if exist zlib.lib del zlib.lib - lib zlib $(OBJ1); - lib zlib $(OBJ2); +$(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; +example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) example.obj,,,$(ZLIB_LIB); -minigzip.exe: minigzip.obj zlib.lib - $(LD) $(LDFLAGS) minigzip.obj,,,zlib.lib; +minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) minigzip.obj,,,$(ZLIB_LIB); test: example.exe minigzip.exe example diff --git a/msdos/Makefile.tc b/msdos/Makefile.tc index a46ce73..63e0550 100644 --- a/msdos/Makefile.tc +++ b/msdos/Makefile.tc @@ -8,18 +8,18 @@ # MAX_WBITS and MAX_MEM_LEVEL. For example: # -DMAX_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: +# 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 -G -Z $(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3 -CFLAGS=-O2 -G -Z $(MODEL) +MODEL=l +# CFLAGS=-O2 -G -Z -m$(MODEL) -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3 +CFLAGS=-O2 -G -Z -m$(MODEL) CC=tcc -I\tc\include LD=tcc -L\tc\lib -LIB=tlib -LDFLAGS=$(MODEL) -f- +AR=tlib +LDFLAGS=-m$(MODEL) -f- O=.obj # variables @@ -32,69 +32,72 @@ OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \ OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\ infutil$(O)+inffast$(O) +ZLIB_H = zlib.h zconf.h +ZUTIL_H = zutil.h $(ZLIB_H) + +ZLIB_LIB = zlib_$(MODEL).lib + all: test -adler32.obj: adler32.c zutil.h zlib.h zconf.h +adler32.obj: adler32.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -compress.obj: compress.c zlib.h zconf.h +compress.obj: compress.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -crc32.obj: crc32.c zutil.h zlib.h zconf.h +crc32.obj: crc32.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h +deflate.obj: deflate.c deflate.h $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -gzio.obj: gzio.c zutil.h zlib.h zconf.h +gzio.obj: gzio.c $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -infblock.obj: infblock.c zutil.h zlib.h zconf.h infblock.h inftrees.h\ - infcodes.h infutil.h +infblock.obj: infblock.c $(ZUTIL_H) infblock.h inftrees.h infcodes.h infutil.h $(CC) -c $(CFLAGS) $*.c -infcodes.obj: infcodes.c zutil.h zlib.h zconf.h inftrees.h infutil.h\ - infcodes.h inffast.h +infcodes.obj: infcodes.c $(ZUTIL_H) inftrees.h infutil.h infcodes.h inffast.h $(CC) -c $(CFLAGS) $*.c -inflate.obj: inflate.c zutil.h zlib.h zconf.h infblock.h +inflate.obj: inflate.c $(ZUTIL_H) infblock.h $(CC) -c $(CFLAGS) $*.c -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h +inftrees.obj: inftrees.c $(ZUTIL_H) inftrees.h $(CC) -c $(CFLAGS) $*.c -infutil.obj: infutil.c zutil.h zlib.h zconf.h inftrees.h infutil.h +infutil.obj: infutil.c $(ZUTIL_H) inftrees.h infutil.h $(CC) -c $(CFLAGS) $*.c -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h +inffast.obj: inffast.c $(ZUTIL_H) inftrees.h infutil.h inffast.h $(CC) -c $(CFLAGS) $*.c -trees.obj: trees.c deflate.h zutil.h zlib.h zconf.h +trees.obj: trees.c deflate.h $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -uncompr.obj: uncompr.c zlib.h zconf.h +uncompr.obj: uncompr.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -zutil.obj: zutil.c zutil.h zlib.h zconf.h +zutil.obj: zutil.c $(ZUTIL_H) $(CC) -c $(CFLAGS) $*.c -example.obj: example.c zlib.h zconf.h +example.obj: example.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c -minigzip.obj: minigzip.c zlib.h zconf.h +minigzip.obj: minigzip.c $(ZLIB_H) $(CC) -c $(CFLAGS) $*.c # 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) +$(ZLIB_LIB): $(OBJ1) $(OBJ2) + del $(ZLIB_LIB) + $(AR) $(ZLIB_LIB) +$(OBJP1) + $(AR) $(ZLIB_LIB) +$(OBJP2) -example.exe: example.obj zlib.lib - $(LD) $(LDFLAGS) -eexample.exe example.obj zlib.lib +example.exe: example.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) -eexample.exe example.obj $(ZLIB_LIB) -minigzip.exe: minigzip.obj zlib.lib - $(LD) $(LDFLAGS) -eminigzip.exe minigzip.obj zlib.lib +minigzip.exe: minigzip.obj $(ZLIB_LIB) + $(LD) $(LDFLAGS) -eminigzip.exe minigzip.obj $(ZLIB_LIB) test: example.exe minigzip.exe example diff --git a/msdos/Makefile.w32 b/msdos/Makefile.w32 index d513c81..0a05fa9 100644 --- a/msdos/Makefile.w32 +++ b/msdos/Makefile.w32 @@ -28,13 +28,13 @@ OBJP2 = zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)+\ all: zlib.lib example.exe minigzip.exe -adler32.obj: adler32.c zutil.h zlib.h zconf.h +adler32.obj: adler32.c zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c compress.obj: compress.c zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c -crc32.obj: crc32.c zutil.h zlib.h zconf.h +crc32.obj: crc32.c zlib.h zconf.h $(CC) -c $(CFLAGS) $*.c deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h diff --git a/msdos/Makefile.wat b/msdos/Makefile.wat index 2a3b629..44bf860 100644 --- a/msdos/Makefile.wat +++ b/msdos/Makefile.wat @@ -30,13 +30,13 @@ OBJP3=infutil$(O)+inffast$(O) all: test -adler32.obj: adler32.c zutil.h zlib.h zconf.h +adler32.obj: adler32.c zlib.h zconf.h $(CC) $(CFLAGS) $*.c compress.obj: compress.c zlib.h zconf.h $(CC) $(CFLAGS) $*.c -crc32.obj: crc32.c zutil.h zlib.h zconf.h +crc32.obj: crc32.c zlib.h zconf.h $(CC) $(CFLAGS) $*.c deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h diff --git a/msdos/zlib.def b/msdos/zlib.def index e4edaad..6c04412 100644 --- a/msdos/zlib.def +++ b/msdos/zlib.def @@ -8,7 +8,7 @@ SUBSYSTEM WINDOWS STUB 'WINSTUB.EXE' -VERSION 1.11 +VERSION 1.13 CODE EXECUTE READ diff --git a/msdos/zlib.rc b/msdos/zlib.rc index 0a38186..556d4ff 100644 --- a/msdos/zlib.rc +++ b/msdos/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE - FILEVERSION 1,1,2,0 - PRODUCTVERSION 1,1,2,0 + FILEVERSION 1,1,3,0 + PRODUCTVERSION 1,1,3,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_DOS_WINDOWS32 @@ -17,7 +17,7 @@ BEGIN BEGIN VALUE "FileDescription", "zlib data compression library\0" - VALUE "FileVersion", "1.1.2\0" + VALUE "FileVersion", "1.1.3\0" VALUE "InternalName", "zlib\0" VALUE "OriginalFilename", "zlib.dll\0" VALUE "ProductName", "ZLib.DLL\0" -- cgit v1.2.3-55-g6feb