aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorVíctor Paesa <victorpaesa@googlemail.com>2007-07-03 16:12:55 +0000
committerVíctor Paesa <victorpaesa@googlemail.com>2007-07-03 16:12:55 +0000
commit41d5a86a41725dfdd7e4e2ec93b763e89dd21953 (patch)
tree7e68f4bc1ff907e2e9fbde34bf66ead7a8f628ed /configure
parentd31c98bf809f5eaf728796fde2df7dae1b661027 (diff)
downloadffmpeg-41d5a86a41725dfdd7e4e2ec93b763e89dd21953.tar.gz
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files 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"