mirror of https://git.ffmpeg.org/ffmpeg.git
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
This commit is contained in:
parent
d31c98bf80
commit
41d5a86a41
|
@ -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"
|
||||||
|
|
Loading…
Reference in New Issue