mirror of https://github.com/mpv-player/mpv
Move decision about whether or not to compile wrapper.S to configure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26148 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d47c6f5f32
commit
e834773166
|
@ -6268,12 +6268,14 @@ echores "$_real"
|
||||||
|
|
||||||
|
|
||||||
echocheck "QuickTime codecs"
|
echocheck "QuickTime codecs"
|
||||||
|
_qtx_emulation=no
|
||||||
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
|
||||||
_def_qtx='#define USE_QTX_CODECS 1'
|
_def_qtx='#define USE_QTX_CODECS 1'
|
||||||
_codecmodules="qtx $_codecmodules"
|
_codecmodules="qtx $_codecmodules"
|
||||||
|
darwin || _qtx_emulation=yes
|
||||||
else
|
else
|
||||||
_def_qtx='#undef USE_QTX_CODECS'
|
_def_qtx='#undef USE_QTX_CODECS'
|
||||||
_nocodecmodules="qtx $_nocodecmodules"
|
_nocodecmodules="qtx $_nocodecmodules"
|
||||||
|
@ -7747,6 +7749,7 @@ DVDCSS_INTERNAL = $_libdvdcss_internal
|
||||||
DVDNAV = $_dvdnav
|
DVDNAV = $_dvdnav
|
||||||
WIN32DLL = $_win32dll
|
WIN32DLL = $_win32dll
|
||||||
QTX_CODECS = $_qtx
|
QTX_CODECS = $_qtx
|
||||||
|
QTX_EMULATION = $_qtx_emulation
|
||||||
REAL_CODECS = $_real
|
REAL_CODECS = $_real
|
||||||
XANIM_CODECS = $_xanim
|
XANIM_CODECS = $_xanim
|
||||||
LIBAVUTIL = $_libavutil
|
LIBAVUTIL = $_libavutil
|
||||||
|
|
|
@ -8,10 +8,7 @@ SRCS_COMMON = driver.c afl.c vfl.c
|
||||||
ifneq ($(TARGET_WIN32),yes)
|
ifneq ($(TARGET_WIN32),yes)
|
||||||
SRCS_COMMON += ldt_keeper.c pe_image.c module.c ext.c win32.c \
|
SRCS_COMMON += ldt_keeper.c pe_image.c module.c ext.c win32.c \
|
||||||
pe_resource.c resource.c registry.c elfdll.c
|
pe_resource.c resource.c registry.c elfdll.c
|
||||||
# QTX emulation is not supported in Darwin
|
SRCS_COMMON-$(QTX_EMULATION) += wrapper.S
|
||||||
ifneq ($(TARGET_OS),Darwin)
|
|
||||||
SRCS_COMMON += wrapper.S
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SRCS_COMMON += dshow/DS_AudioDecoder.c \
|
SRCS_COMMON += dshow/DS_AudioDecoder.c \
|
||||||
|
|
Loading…
Reference in New Issue