[Zlib-devel] zlib 1.2.4.1 beta

[William A. Rowe Jr.]

On 3/28/2010 2:15 PM, Mark Adler wrote:
> 
> You can find the 1.2.4.1 beta here:

Mark, here is a trivial patch to straighten out the masm mess with some
sensible hints (the existing comment was nonsense for win32).  It works as
advertised on a range of ms visual studios from version 6 thru 9

--- ../zlib-1.2.4.1-orig/win32/Makefile.msc	Sun Mar 07 00:30:35 2010
+++ win32/Makefile.msc	Sun Mar 28 22:11:14 2010
@@ -2,15 +2,16 @@
 # zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
 #
 # Usage:
-#   nmake -f win32/Makefile.msc            (standard build)
-#   nmake -f win32/Makefile.msc LOC=-DFOO  (nonstandard build)
-#   nmake -f win32/Makefile.msc LOC=-DASMV OBJA=match.obj  (use ASM code)
-
+#   nmake -f win32/Makefile.msc                          (standard build)
+#   nmake -f win32/Makefile.msc LOC=-DFOO                (nonstandard build)
+#   nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" \
+#         OBJA="inffas32.obj match686.obj"               (use ASM code, x86)
+#   nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF" \
+#         OBJA="inffasx64.obj gvmat64.obj inffas8664.c"  (use ASM code, x64)

 # optional build flags
 LOC =

-
 # variables
 STATICLIB = zlib.lib
 SHAREDLIB = zlib1.dll
@@ -23,13 +24,13 @@
 RC = rc
 CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
 WFLAGS  = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
-ASFLAGS = -coff -Zi
+ASFLAGS = -coff -Zi $(LOC)
 LDFLAGS = -nologo -debug -incremental:no -opt:ref
 ARFLAGS = -nologo
 RCFLAGS = /dWIN32 /r

 OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \
-       gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj
zutil.obj
+       gzwrite.obj infback.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
 OBJA =


@@ -71,7 +72,13 @@
 .c.obj:
 	$(CC) -c $(WFLAGS) $(CFLAGS) $<

-.asm.obj:
+{contrib/masmx64}.c.obj:
+	$(CC) -c $(WFLAGS) $(CFLAGS) $<
+
+{contrib/masmx64}.asm.obj:
+	$(AS) -c $(ASFLAGS) $<
+
+{contrib/masmx86}.asm.obj:
 	$(AS) -c $(ASFLAGS) $<

 adler32.obj: adler32.c zlib.h zconf.h
@@ -106,6 +113,17 @@
 uncompr.obj: uncompr.c zlib.h zconf.h

 zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+gvmat64.obj: contrib\masmx64\gvmat64.asm
+
+inffasx64.obj: contrib\masmx64\inffasx64.asm
+
+inffas8664.obj: contrib\masmx64\inffas8664.c zutil.h zlib.h zconf.h \
+		inftrees.h inflate.h inffast.h
+
+inffas32.obj: contrib\masmx86\inffas32.asm
+
+match686.obj: contrib\masmx86\match686.asm

 example.obj: example.c zlib.h zconf.h