diff options
author | Matthias Klose <doko@ubuntu.com> | 2012-11-16 18:35:05 +0000 |
---|---|---|
committer | Matthias Klose <doko@gcc.gnu.org> | 2012-11-16 18:35:05 +0000 |
commit | 9acb8ddf3e7cf312de229eae11e0a1df29548ec9 (patch) | |
tree | 134aeb9aadb88e8719595edaaa40522b99d2a56a /zlib/win32/Makefile.msc | |
parent | 50605a7f19869692a6c29cead0a1366a420e0e65 (diff) |
2012-11-16 Matthias Klose <doko@ubuntu.com>
* Imported zlib 1.2.7; merged local changes.
From-SVN: r193574
Diffstat (limited to 'zlib/win32/Makefile.msc')
-rw-r--r-- | zlib/win32/Makefile.msc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/zlib/win32/Makefile.msc b/zlib/win32/Makefile.msc index fa10a1aa5f1..59bb0dae5d2 100644 --- a/zlib/win32/Makefile.msc +++ b/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 |