mirror of https://github.com/mpv-player/mpv
Merge internal and external VIDIX checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23332 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
ebc9066be9
commit
f998479792
|
@ -7203,20 +7203,18 @@ _def_linux='#undef TARGET_LINUX'
|
|||
linux && _def_linux='#define TARGET_LINUX 1'
|
||||
|
||||
# TODO cleanup the VIDIX stuff here
|
||||
echocheck "VIDIX (internal)"
|
||||
echores "$_vidix_internal"
|
||||
|
||||
echocheck "VIDIX (external)"
|
||||
if test "$_vidix_external" = auto; then
|
||||
echocheck "VIDIX"
|
||||
if test "$_vidix_internal" = yes; then
|
||||
_res_comment="internal"
|
||||
_vidix_external=no
|
||||
elif test "$_vidix_external" = auto; then
|
||||
_vidix_external=no
|
||||
cat > $TMPC <<EOF
|
||||
#include <vidix/vidix.h>
|
||||
int main(void) { return 0; }
|
||||
EOF
|
||||
cc_check -lvidix && _vidix_external=yes
|
||||
cc_check -lvidix && _vidix_external=yes && _res_comment="external"
|
||||
fi
|
||||
echores "$_vidix_external"
|
||||
|
||||
if test "$_vidix_internal" = yes || test "$_vidix_external" = yes ; then
|
||||
_vidix=yes
|
||||
_def_vidix='#define CONFIG_VIDIX 1'
|
||||
|
@ -7224,6 +7222,7 @@ else
|
|||
_vidix=no
|
||||
_def_vidix='#undef CONFIG_VIDIX'
|
||||
fi
|
||||
echores "$_vidix"
|
||||
|
||||
if test "$_vidix" = yes ; then
|
||||
if test "$_vidix_drivers" = all || test `echo "$_vidix_drivers" | grep -e cyberblade`; then
|
||||
|
|
Loading…
Reference in New Issue