summaryrefslogtreecommitdiffstats
path: root/compat/zlib/win32/Makefile.msc
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-06-16 14:48:35 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-06-16 14:48:35 (GMT)
commitb700360ad9501defb0b1e2d86353ac8d0db8eef4 (patch)
tree8b3bcb3adb8bd2eb44bcf16bb091722274e03e9e /compat/zlib/win32/Makefile.msc
parentc755ef08151343eb145710489f8c999edbef15ff (diff)
parent296aebbd6ee092a25741684fa37ee31ef5a3e222 (diff)
downloadtcl-b700360ad9501defb0b1e2d86353ac8d0db8eef4.zip
tcl-b700360ad9501defb0b1e2d86353ac8d0db8eef4.tar.gz
tcl-b700360ad9501defb0b1e2d86353ac8d0db8eef4.tar.bz2
Merge up to the 8.6.0 release.
Diffstat (limited to 'compat/zlib/win32/Makefile.msc')
-rw-r--r--compat/zlib/win32/Makefile.msc13
1 files changed, 8 insertions, 5 deletions
diff --git a/compat/zlib/win32/Makefile.msc b/compat/zlib/win32/Makefile.msc
index fa10a1a..59bb0da 100644
--- a/compat/zlib/win32/Makefile.msc
+++ b/compat/zlib/win32/Makefile.msc
@@ -6,8 +6,8 @@
# 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)
+# nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \
+# OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" (use ASM code, x64)
# optional build flags
LOC =
@@ -30,7 +30,7 @@ ARFLAGS = -nologo
RCFLAGS = /dWIN32 /r
OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \
- gzwrite.obj infback.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+ gzwrite.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj
OBJA =
@@ -72,6 +72,9 @@ minigzip_d.exe: minigzip.obj $(IMPLIB)
.c.obj:
$(CC) -c $(WFLAGS) $(CFLAGS) $<
+{test}.c.obj:
+ $(CC) -c -I. $(WFLAGS) $(CFLAGS) $<
+
{contrib/masmx64}.c.obj:
$(CC) -c $(WFLAGS) $(CFLAGS) $<
@@ -125,9 +128,9 @@ inffas32.obj: contrib\masmx86\inffas32.asm
match686.obj: contrib\masmx86\match686.asm
-example.obj: example.c zlib.h zconf.h
+example.obj: test/example.c zlib.h zconf.h
-minigzip.obj: minigzip.c zlib.h zconf.h
+minigzip.obj: test/minigzip.c zlib.h zconf.h
zlib1.res: win32/zlib1.rc
$(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc