From cb5166a3ed54e50b58340205a85a43934159ca87 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Wed, 16 Jan 2019 12:00:38 +0100 Subject: [PATCH] Fix win32 makefiles to no longer attempt to build match.obj. Both of these makefiles should get their dependency maps regenerated, since they seem to be very outdated. --- win32/Makefile.arm | 4 +--- win32/Makefile.msc | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/win32/Makefile.arm b/win32/Makefile.arm index 656e4cf3..1aec4d48 100644 --- a/win32/Makefile.arm +++ b/win32/Makefile.arm @@ -38,7 +38,7 @@ NEON_ARCH = /arch:VFPv4 SUFFIX = OBJS = adler32.obj armfeature.obj compress.obj crc32.obj deflate.obj deflate_fast.obj deflate_slow.obj \ - functable.obj infback.obj inflate.obj inftrees.obj inffast.obj match.obj trees.obj uncompr.obj zutil.obj fill_window_arm.obj + functable.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj fill_window_arm.obj !if "$(WITH_GZFILEOP)" != "" WFLAGS = $(WFLAGS) -DWITH_GZFILEOP OBJS = $(OBJS) gzclose.obj gzlib.obj gzread.obj gzwrite.obj @@ -141,8 +141,6 @@ inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf$(SUFFIX).h $(TOP)/inftrees.h -match.obj: $(TOP)/match.c $(TOP)/deflate.h - trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf$(SUFFIX).h $(TOP)/deflate.h $(TOP)/trees.h uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf$(SUFFIX).h diff --git a/win32/Makefile.msc b/win32/Makefile.msc index 08ee855d..236d718d 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -35,7 +35,7 @@ ZLIB_COMPAT = SUFFIX = OBJS = adler32.obj compress.obj crc32.obj deflate.obj deflate_fast.obj deflate_quick.obj deflate_slow.obj \ - functable.obj infback.obj inflate.obj inftrees.obj inffast.obj match.obj trees.obj uncompr.obj zutil.obj \ + functable.obj infback.obj inflate.obj inftrees.obj inffast.obj trees.obj uncompr.obj zutil.obj \ x86.obj fill_window_sse.obj insert_string_sse.obj crc_folding.obj crc_pclmulqdq.obj !if "$(ZLIB_COMPAT)" != "" WITH_GZFILEOP = yes @@ -132,8 +132,6 @@ inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf$(SUFFIX).h $(TOP)/inftrees.h -match.obj: $(TOP)/match.c $(TOP)/deflate.h - trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf$(SUFFIX).h $(TOP)/deflate.h $(TOP)/trees.h uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib$(SUFFIX).h $(TOP)/zconf$(SUFFIX).h -- 2.47.2