From 70b4d4929430be9ed6c4eb1ebd1b661327ce04ea Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Sat, 11 Aug 2007 19:51:37 +0000 Subject: [PATCH] Enable swscale in MinGW vhooks only if swscale was configured. Copied from Cygwin configure. Originally committed as revision 10073 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 34e2bebf31..7c7a5524c8 100755 --- a/configure +++ b/configure @@ -1163,8 +1163,12 @@ case $targetos in targetos=mingw32 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 ffserver="no" network="no" SLIBPREF=""