Commit 6c8e5d72 authored by victor's avatar victor

On Cygwin, libswscale is needed in VHOOK(SHFLAGS|LIBS) only when

--enable-swscaler is set.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9469 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 0484aaa8
...@@ -1163,8 +1163,12 @@ case $targetos in ...@@ -1163,8 +1163,12 @@ case $targetos in
targetos=cygwin targetos=cygwin
shlibdir="$bindir" shlibdir="$bindir"
dv1394="no" dv1394="no"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libswscale -L$(BUILD_ROOT)/libavutil' VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lswscale$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
if enabled swscaler; then
VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
fi
osextralibs="" osextralibs=""
EXESUF=".exe" EXESUF=".exe"
SLIBPREF="cyg" SLIBPREF="cyg"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment