1 files changed, 72 insertions, 47 deletions

diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc
index da32859..62a8430 100644
--- a/win32/Makefile.gcc
+++ b/win32/Makefile.gcc
@@ -1,26 +1,36 @@
 # 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.
+# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
+# Last updated: 1-Aug-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 
+# Copyright (C) 1995-2003 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
-# 
+#
+#   make -fmakefile.gcc;  make test testdll -fmakefile.gcc
+#
+# To use the asm code, type:
+#   cp contrib/asm?86/match.S ./match.S
+#   make LOC=-DASMV OBJA=match.o -fmakefile.gcc
+#
 # To install libz.a, zconf.h and zlib.h in the system directories, type:
-# 
-#    make install -fmakefile.gcc
-# 
+#
+#   make install -fmakefile.gcc
 
-LIB = libz.a
-SHAREDLIB = zlib.dll
-VER = 1.2.0
+# Note:
+# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
+# the DLL name should be changed from "zlib1.dll".
+
+STATICLIB = libz.a
+SHAREDLIB = zlib1.dll
+IMPLIB    = libzdll.a
+
+#LOC = -DASMV
+#LOC = -DDEBUG -g
 
 CC = gcc
-#CFLAGS = -DDEBUG -MMD -g
 CFLAGS = $(LOC) -O3 -Wall
 
 AS = $(CC)
@@ -33,6 +43,7 @@ AR = ar
 ARFLAGS = rcs
 
 RC = windres
+RCFLAGS = --define GCC_WINDRES
 
 CP = cp -fp
 # If GNU install is available, replace $(CP) with install.
@@ -44,61 +55,75 @@ 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
-
-DLLDEF = win32/zlibgcc.def
-
-# to use the asm code: make OBJA=match.o
 OBJA =
 
-TEST_OBJS = example.o minigzip.o
-
-all: $(LIB) $(SHAREDLIB) example minigzip
+all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example minigzip example_d minigzip_d
 
-test: all
+test: example minigzip
         ./example
-        echo hello world | ./minigzip | ./minigzip -d 
+        echo hello world | ./minigzip | ./minigzip -d
+
+testdll: example_d minigzip_d
+        ./example_d
+        echo hello world | ./minigzip_d | ./minigzip_d -d
 
 .c.o:
         $(CC) $(CFLAGS) -c -o $@ $<
 
-libz.a: $(OBJS)
-        $(AR) $(ARFLAGS) $@ $(OBJS)
+.S.o:
+        $(AS) $(ASFLAGS) -c -o $@ $<
+
+$(STATICLIB): $(OBJS) $(OBJA)
+        $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+
+$(IMPLIB): $(SHAREDLIB)
+
+$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+        dllwrap --driver-name $(CC) --def win32/zlib.def \
+          --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
+        strip $@
+
+example: example.o $(STATICLIB)
+        $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
 
-$(SHAREDLIB): $(OBJS) $(DLLDEF) zlibrc.o
-        dllwrap --driver-name $(CC) --def $(DLLDEF) -o $@ $(OBJS) zlibrc.o
+minigzip: minigzip.o $(STATICLIB)
+        $(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
 
-example: example.o $(LIB)
-        $(LD) -o $@ $< $(LIB)
+example_d: example.o $(IMPLIB)
+        $(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
 
-minigzip: minigzip.o $(LIB)
-        $(LD) -o $@ $< $(LIB)
+minigzip_d: minigzip.o $(IMPLIB)
+        $(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
 
-zlibrc.o: win32/zlib.rc
-        -$(RC) -o $@ --define GCC_WINDRES win32/zlib.rc
+zlibrc.o: win32/zlib1.rc
+        $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
 
 
-# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
+# INCLUDE_PATH and LIBRARY_PATH must be set.
 
-.PHONY : uninstall clean
+.PHONY: install 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)
+        -$(INSTALL) zlib.h $(INCLUDE_PATH)
+        -$(INSTALL) zconf.h $(INCLUDE_PATH)
+        -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
+        -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH)
 
 uninstall:
-        $(RM) $(INCLUDE_PATH)/zlib.h
-        $(RM) $(INCLUDE_PATH)/zconf.h
-        $(RM) $(LIBRARY_PATH)/libz.a
+        -$(RM) $(INCLUDE_PATH)/zlib.h
+        -$(RM) $(INCLUDE_PATH)/zconf.h
+        -$(RM) $(LIBRARY_PATH)/$(STATICLIB)
+        -$(RM) $(LIBRARY_PATH)/$(IMPLIB)
 
 clean:
-        $(RM) *.o
-        $(RM) *.exe
-        $(RM) libz.a
-        $(RM) zlib.dll
-        $(RM) foo.gz
+        -$(RM) $(STATICLIB)
+        -$(RM) $(SHAREDLIB)
+        -$(RM) $(IMPLIB)
+        -$(RM) *.o
+        -$(RM) *.exe
+        -$(RM) foo.gz
 
 adler32.o: zlib.h zconf.h
 compress.o: zlib.h zconf.h
@@ -110,7 +135,7 @@ 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 
+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  
+zutil.o: zutil.h zlib.h zconf.h