summaryrefslogtreecommitdiff
path: root/cpukit/zlib/win32/Makefile.msc
diff options
context:
space:
mode:
Diffstat (limited to 'cpukit/zlib/win32/Makefile.msc')
-rw-r--r--cpukit/zlib/win32/Makefile.msc34
1 files changed, 8 insertions, 26 deletions
diff --git a/cpukit/zlib/win32/Makefile.msc b/cpukit/zlib/win32/Makefile.msc
index fa10a1aa5f..a731c0c621 100644
--- a/cpukit/zlib/win32/Makefile.msc
+++ b/cpukit/zlib/win32/Makefile.msc
@@ -2,16 +2,15 @@
# 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 -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 (standard build)
+# nmake -f win32/Makefile.msc LOC=-DFOO (nonstandard build)
+# nmake -f win32/Makefile.msc LOC=-DASMV OBJA=match.obj (use ASM code)
+
# optional build flags
LOC =
+
# variables
STATICLIB = zlib.lib
SHAREDLIB = zlib1.dll
@@ -24,13 +23,13 @@ AR = lib
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 $(LOC)
+ASFLAGS = -coff -Zi
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 inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+ gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
OBJA =
@@ -72,13 +71,7 @@ minigzip_d.exe: minigzip.obj $(IMPLIB)
.c.obj:
$(CC) -c $(WFLAGS) $(CFLAGS) $<
-{contrib/masmx64}.c.obj:
- $(CC) -c $(WFLAGS) $(CFLAGS) $<
-
-{contrib/masmx64}.asm.obj:
- $(AS) -c $(ASFLAGS) $<
-
-{contrib/masmx86}.asm.obj:
+.asm.obj:
$(AS) -c $(ASFLAGS) $<
adler32.obj: adler32.c zlib.h zconf.h
@@ -114,17 +107,6 @@ 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
minigzip.obj: minigzip.c zlib.h zconf.h