From 41d5a86a41725dfdd7e4e2ec93b763e89dd21953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Paesa?= Date: Tue, 3 Jul 2007 16:12:55 +0000 Subject: [PATCH] On Cygwin, libswscale is needed in VHOOK(SHFLAGS|LIBS) only when --enable-swscaler is set. Originally committed as revision 9469 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 8be91e1e54..1d5f66ef66 100755 --- a/configure +++ b/configure @@ -1163,8 +1163,12 @@ case $targetos in targetos=cygwin shlibdir="$bindir" dv1394="no" - VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libswscale -L$(BUILD_ROOT)/libavutil' - VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lswscale$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' + VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' + VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' + if enabled swscaler; then + VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale" + VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)" + fi osextralibs="" EXESUF=".exe" SLIBPREF="cyg"