diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-07 02:29:55 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-07 02:29:55 +0000 |
| commit | 2a7f6ab7f13ac15712708527c2f21432c6a276e8 (patch) | |
| tree | bfe1e05cc0c494485ea9f92e4a9b5ad812ff5ee4 | |
| parent | b13e5950a687a76a8010177c9ca3d6f736dd61d3 (diff) | |
| download | mpv-2a7f6ab7f13ac15712708527c2f21432c6a276e8.tar.bz2 mpv-2a7f6ab7f13ac15712708527c2f21432c6a276e8.tar.xz | |
finished making vesa optional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4562 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libvo/video_out.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1928,12 +1928,15 @@ fi if test "$_vesa" != no ; then echocheck "VESA support" if x86 && linux ; then + _def_vesa='#define HAVE_VESA 1' _vosrc="$_vosrc vo_vesa.c vesa_lvo.c" _vomodules="vesa $_vomodules" echores "yes" else + _def_vesa='#undef HAVE_VESA' echores "no (not supported on this OS/architecture)" fi +_def_vesa='#undef HAVE_VESA' fi @@ -3278,6 +3281,7 @@ $_def_fbdev_nocopy $_def_dxr3 $_def_dvb $_def_svga +$_def_vesa $_def_xdpms $_def_aa diff --git a/libvo/video_out.c b/libvo/video_out.c index 1b4c22402d..139e1153c8 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -85,7 +85,7 @@ extern vo_functions_t video_out_ggi; extern vo_functions_t video_out_aa; extern vo_functions_t video_out_mpegpes; extern vo_functions_t video_out_dxr3; -#ifdef TARGET_LINUX +#ifdef HAVE_VESA extern vo_functions_t video_out_vesa; #endif extern vo_functions_t video_out_directfb; @@ -154,7 +154,7 @@ vo_functions_t* video_out_drivers[] = &video_out_pgm, &video_out_md5, &video_out_mpegpes, -#if defined( ARCH_X86 ) && defined( TARGET_LINUX ) +#ifdef HAVE_VESA &video_out_vesa, #endif #ifdef HAVE_DIRECTFB |