From 7f0064361afc300c53843518bcbe79b4b3670b10 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 20 Dec 2019 08:50:48 -0800 Subject: [PATCH] Makefile.vc: fix webp_quality.exe link when building a dll based libwebp include the dsp private symbols that WebPUnmultiplyARGB requires Change-Id: I7cf7da0b20d6cf6740219c8562380926a0abd93c (cherry picked from commit cf047e8347314937435aabe643cf2fee0aa4a55b) --- Makefile.vc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.vc b/Makefile.vc index 8a54559a..886f981f 100644 --- a/Makefile.vc +++ b/Makefile.vc @@ -391,7 +391,13 @@ $(DIRBIN)\get_disto.exe: $(IMAGEIO_DEC_OBJS) $(IMAGEIO_UTIL_OBJS) $(DIRBIN)\get_disto.exe: $(LIBWEBPDEMUX) $(LIBWEBP) $(DIRBIN)\webp_quality.exe: $(DIROBJ)\extras\webp_quality.obj $(DIRBIN)\webp_quality.exe: $(IMAGEIO_UTIL_OBJS) -$(DIRBIN)\webp_quality.exe: $(EXTRAS_OBJS) $(LIBWEBP) +$(DIRBIN)\webp_quality.exe: $(EXTRAS_OBJS) +# EXTRA_OBJS requires private symbols from dsp. Explicitly add those when +# building libwebp as a dll. +!IF "$(DLLBUILD)" == "TRUE" +$(DIRBIN)\webp_quality.exe: $(DSP_DEC_OBJS) +!ENDIF +$(DIRBIN)\webp_quality.exe: $(LIBWEBP) $(DIRBIN)\webpinfo.exe: $(DIROBJ)\examples\webpinfo.obj $(DIRBIN)\webpinfo.exe: $(IMAGEIO_DEC_OBJS) $(DIRBIN)\webpinfo.exe: $(EX_UTIL_OBJS) $(IMAGEIO_UTIL_OBJS)