finished making vesa optional

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4562 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rfelker 2002-02-07 02:29:55 +00:00
parent b13e5950a6
commit 2a7f6ab7f1
2 changed files with 6 additions and 2 deletions

4
configure vendored
View File

@ -1928,12 +1928,15 @@ fi
if test "$_vesa" != no ; then if test "$_vesa" != no ; then
echocheck "VESA support" echocheck "VESA support"
if x86 && linux ; then if x86 && linux ; then
_def_vesa='#define HAVE_VESA 1'
_vosrc="$_vosrc vo_vesa.c vesa_lvo.c" _vosrc="$_vosrc vo_vesa.c vesa_lvo.c"
_vomodules="vesa $_vomodules" _vomodules="vesa $_vomodules"
echores "yes" echores "yes"
else else
_def_vesa='#undef HAVE_VESA'
echores "no (not supported on this OS/architecture)" echores "no (not supported on this OS/architecture)"
fi fi
_def_vesa='#undef HAVE_VESA'
fi fi
@ -3278,6 +3281,7 @@ $_def_fbdev_nocopy
$_def_dxr3 $_def_dxr3
$_def_dvb $_def_dvb
$_def_svga $_def_svga
$_def_vesa
$_def_xdpms $_def_xdpms
$_def_aa $_def_aa

View File

@ -85,7 +85,7 @@ extern vo_functions_t video_out_ggi;
extern vo_functions_t video_out_aa; extern vo_functions_t video_out_aa;
extern vo_functions_t video_out_mpegpes; extern vo_functions_t video_out_mpegpes;
extern vo_functions_t video_out_dxr3; extern vo_functions_t video_out_dxr3;
#ifdef TARGET_LINUX #ifdef HAVE_VESA
extern vo_functions_t video_out_vesa; extern vo_functions_t video_out_vesa;
#endif #endif
extern vo_functions_t video_out_directfb; extern vo_functions_t video_out_directfb;
@ -154,7 +154,7 @@ vo_functions_t* video_out_drivers[] =
&video_out_pgm, &video_out_pgm,
&video_out_md5, &video_out_md5,
&video_out_mpegpes, &video_out_mpegpes,
#if defined( ARCH_X86 ) && defined( TARGET_LINUX ) #ifdef HAVE_VESA
&video_out_vesa, &video_out_vesa,
#endif #endif
#ifdef HAVE_DIRECTFB #ifdef HAVE_DIRECTFB