mirror of https://github.com/mpv-player/mpv
CONFIG_QUICKTIME should be set depending on the state of QTX support.
This fixes linking on Mac OS X with vo_quartz disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29255 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d9ded9284c
commit
114fa5bd06
|
@ -3842,11 +3842,9 @@ if test "$_quartz" = yes ; then
|
||||||
extra_ldflags="$extra_ldflags -framework Carbon -framework QuickTime"
|
extra_ldflags="$extra_ldflags -framework Carbon -framework QuickTime"
|
||||||
def_quartz='#define CONFIG_QUARTZ 1'
|
def_quartz='#define CONFIG_QUARTZ 1'
|
||||||
_vomodules="quartz $_vomodules"
|
_vomodules="quartz $_vomodules"
|
||||||
def_quicktime='#define CONFIG_QUICKTIME 1'
|
|
||||||
else
|
else
|
||||||
def_quartz='#undef CONFIG_QUARTZ'
|
def_quartz='#undef CONFIG_QUARTZ'
|
||||||
_novomodules="quartz $_novomodules"
|
_novomodules="quartz $_novomodules"
|
||||||
def_quicktime='#undef CONFIG_QUICKTIME'
|
|
||||||
fi
|
fi
|
||||||
echores $_quartz
|
echores $_quartz
|
||||||
|
|
||||||
|
@ -6756,11 +6754,12 @@ echores "$_real"
|
||||||
echocheck "QuickTime codecs"
|
echocheck "QuickTime codecs"
|
||||||
_qtx_emulation=no
|
_qtx_emulation=no
|
||||||
def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32'
|
def_qtx_win32='#undef CONFIG_QTX_CODECS_WIN32'
|
||||||
|
def_quicktime='#undef CONFIG_QUICKTIME'
|
||||||
if test "$_qtx" = auto ; then
|
if test "$_qtx" = auto ; then
|
||||||
test "$_win32dll" = yes || darwin && _qtx=yes
|
test "$_win32dll" = yes || darwin && _qtx=yes
|
||||||
fi
|
fi
|
||||||
if test "$_qtx" = yes ; then
|
if test "$_qtx" = yes ; then
|
||||||
darwin && extra_ldflags="$extra_ldflags -framework QuickTime"
|
darwin && extra_ldflags="$extra_ldflags -framework QuickTime" && def_quicktime='#define CONFIG_QUICKTIME 1'
|
||||||
def_qtx='#define CONFIG_QTX_CODECS 1'
|
def_qtx='#define CONFIG_QTX_CODECS 1'
|
||||||
win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1'
|
win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1'
|
||||||
_codecmodules="qtx $_codecmodules"
|
_codecmodules="qtx $_codecmodules"
|
||||||
|
|
Loading…
Reference in New Issue