mirror of
https://github.com/mpv-player/mpv
synced 2024-08-24 07:21:49 +02:00
Move FFmpeg library dependencies into the Makefile just like everything else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego
parent
40b99d0282
commit
cc9eb2aac3
22
Makefile
22
Makefile
@ -63,9 +63,6 @@ COMMON_LIBS = libmpcodecs/libmpcodecs.a \
|
||||
libswscale/libswscale.a \
|
||||
libvo/libosd.a \
|
||||
osdep/libosdep.a \
|
||||
$(AV_LIB) \
|
||||
$(EXTRA_LIB)\
|
||||
$(EXTRALIBS) \
|
||||
|
||||
LIBS_MPLAYER = libvo/libvo.a \
|
||||
libao2/libao2.a \
|
||||
@ -97,6 +94,22 @@ PARTS = libmpdemux \
|
||||
libvo \
|
||||
libaf \
|
||||
|
||||
ifeq ($(CONFIG_LIBAVFORMAT),yes)
|
||||
COMMON_LIBS += libavformat/libavformat.a
|
||||
PARTS += libavformat
|
||||
endif
|
||||
ifeq ($(CONFIG_LIBAVCODEC),yes)
|
||||
COMMON_LIBS += libavcodec/libavcodec.a
|
||||
PARTS += libavcodec
|
||||
endif
|
||||
ifeq ($(CONFIG_LIBAVUTIL),yes)
|
||||
COMMON_LIBS += libavutil/libavutil.a
|
||||
PARTS += libavutil
|
||||
endif
|
||||
ifeq ($(CONFIG_LIBPOSTPROC),yes)
|
||||
COMMON_LIBS += libpostproc/libpostproc.a
|
||||
PARTS += libpostproc
|
||||
endif
|
||||
ifeq ($(WIN32DLL),yes)
|
||||
COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a
|
||||
PARTS += loader loader/dshow loader/dmo
|
||||
@ -154,6 +167,9 @@ ifeq ($(TARGET_WIN32),yes)
|
||||
OBJS_MPLAYER += osdep/mplayer-rc.o
|
||||
endif
|
||||
|
||||
COMMON_LIBS += $(EXTRA_LIB)\
|
||||
$(EXTRALIBS) \
|
||||
|
||||
ifeq ($(MPLAYER),yes)
|
||||
ALL_PRG = mplayer$(EXESUF)
|
||||
endif
|
||||
|
||||
37
configure
vendored
37
configure
vendored
@ -6084,12 +6084,12 @@ int main(void) { ff_gcd(1,1); return 0; }
|
||||
EOF
|
||||
if $_pkg_config --exists libavutil ; then
|
||||
_inc_libavutil=`$_pkg_config --cflags libavutil`
|
||||
_ld_libavutil=`$_pkg_config --libs libavutil`
|
||||
cc_check $_inc_libavutil $_ld_libavutil && _libavutil_so=yes
|
||||
_ld_tmp=`$_pkg_config --libs libavutil`
|
||||
cc_check $_inc_libavutil $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \
|
||||
&& _libavutil_so=yes
|
||||
elif cc_check -lavutil $_ld_lm ; then
|
||||
_ld_extra="$_ld_extra -lavutil"
|
||||
_libavutil_so=yes
|
||||
fi
|
||||
if test "$_libavutil_so" = yes ; then
|
||||
_res_comment="using libavutil.so, but static libavutil is recommended"
|
||||
fi
|
||||
fi
|
||||
@ -6115,12 +6115,12 @@ int main(void) {
|
||||
EOF
|
||||
if $_pkg_config --exists libavcodec ; then
|
||||
_inc_libavcodec=`$_pkg_config --cflags libavcodec`
|
||||
_ld_libavcodec=`$_pkg_config --libs libavcodec`
|
||||
cc_check $_inc_libavcodec $_ld_libavcodec && _libavcodec_so=yes
|
||||
_ld_tmp=`$_pkg_config --libs libavcodec`
|
||||
cc_check $_inc_libavcodec $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \
|
||||
&& _libavcodec_so=yes
|
||||
elif cc_check -lavcodec $_ld_lm ; then
|
||||
_ld_extra="$_ld_extra -lavcodec"
|
||||
_libavcodec_so=yes
|
||||
fi
|
||||
if test "$_libavcodec_so" = yes ; then
|
||||
_res_comment="using libavcodec.so, but static libavcodec is recommended"
|
||||
fi
|
||||
fi
|
||||
@ -6138,12 +6138,12 @@ if test "$_libavformat_so" = auto ; then
|
||||
EOF
|
||||
if $_pkg_config --exists libavformat ; then
|
||||
_inc_libavformat=`$_pkg_config --cflags libavformat`
|
||||
_ld_libavformat=`$_pkg_config --libs libavformat`
|
||||
cc_check $_inc_libavformat $_ld_libavformat && _libavformat_so=yes
|
||||
_ld_tmp=`$_pkg_config --libs libavformat`
|
||||
cc_check $_inc_libavformat $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" \
|
||||
&& _libavformat_so=yes
|
||||
elif cc_check $_ld_lm -lavformat ; then
|
||||
_libavformat_so=yes
|
||||
fi
|
||||
if test "$_libavformat_so" = yes ; then
|
||||
_ld_extra="$_ld_extra -lavformat"
|
||||
_libavformat_so=yes
|
||||
_res_comment="using libavformat.so, but static libavformat is recommended"
|
||||
fi
|
||||
fi
|
||||
@ -6163,6 +6163,7 @@ if test "$_libpostproc_so" = auto ; then
|
||||
return 0;}
|
||||
EOF
|
||||
if cc_check -lpostproc $_ld_lm ; then
|
||||
_ld_extra="$_ld_extra -lpostproc"
|
||||
_libpostproc_so=yes
|
||||
_res_comment="using libpostproc.so, but static libpostproc is recommended"
|
||||
fi
|
||||
@ -6187,15 +6188,10 @@ fi
|
||||
if test "$_libavcodec" = yes ; then
|
||||
_def_libavcodec='#define USE_LIBAVCODEC 1'
|
||||
_def_lavc_dsputil='#define USE_LIBAVCODEC_DSPUTIL'
|
||||
_ld_libavcodec='libavcodec/libavcodec.a'
|
||||
_codecmodules="libavcodec $_codecmodules"
|
||||
if test "$_libavutil" = yes; then
|
||||
_ld_libavutil='libavutil/libavutil.a'
|
||||
fi
|
||||
elif test "$_libavcodec_so" = yes ; then
|
||||
_def_libavcodec='#define USE_LIBAVCODEC 1'
|
||||
_def_libavcodec_so='#define USE_LIBAVCODEC_SO 1'
|
||||
test "$_ld_libavcodec" || _ld_libavcodec='-lavcodec'
|
||||
_codecmodules="libavcodec.so $_codecmodules"
|
||||
else
|
||||
_nocodecmodules="libavcodec $_nocodecmodules"
|
||||
@ -6206,14 +6202,12 @@ _def_libavformat_so='#undef USE_LIBAVFORMAT_SO'
|
||||
_def_libavformat_win32='#undef CONFIG_WIN32'
|
||||
if test "$_libavformat" = yes ; then
|
||||
_def_libavformat='#define USE_LIBAVFORMAT 1'
|
||||
_ld_libavformat='libavformat/libavformat.a'
|
||||
if win32 ; then
|
||||
_def_libavformat_win32='#define CONFIG_WIN32 1'
|
||||
fi
|
||||
else
|
||||
if test "$_libavformat_so" = yes ; then
|
||||
_def_libavformat_so='#define USE_LIBAVFORMAT_SO 1'
|
||||
test "$_ld_libavformat" || _ld_libavformat='-lavformat'
|
||||
if win32 ; then
|
||||
_def_libavformat_win32='#define CONFIG_WIN32 1'
|
||||
fi
|
||||
@ -6224,11 +6218,9 @@ _def_libpostproc='#undef USE_LIBPOSTPROC'
|
||||
_def_libpostproc_so='#undef USE_LIBPOSTPROC_SO'
|
||||
if test "$_libpostproc" = yes ; then
|
||||
_def_libpostproc='#define USE_LIBPOSTPROC 1'
|
||||
_ld_libpostproc='libpostproc/libpostproc.a'
|
||||
else
|
||||
if test "$_libpostproc_so" = yes ; then
|
||||
_def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1'
|
||||
_ld_libpostproc='-lpostproc'
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -7413,7 +7405,6 @@ WIN32DLL = $_win32
|
||||
QTX_CODECS = $_qtx
|
||||
REAL_CODECS = $_real
|
||||
XANIM_CODECS = $_xanim
|
||||
AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil $_ld_libpostproc
|
||||
CONFIG_LIBAVUTIL = $_libavutil
|
||||
CONFIG_LIBAVUTIL_SO = $_libavutil_so
|
||||
CONFIG_LIBAVCODEC = $_libavcodec
|
||||
|
||||
Loading…
Reference in New Issue
Block a user