diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 23:57:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 23:57:14 +0200 |
| commit | 67b40bd21988fed2f70b1c4f5aea301b28f78298 (patch) | |
| tree | d68ea94ae2d712cb2e991496049bc13f19d9ea60 /configure | |
| parent | 9fe4f647824b8067ea4e4f6cf7f699e6c8fa67cb (diff) | |
| parent | f97fd3eff02bd1048750f350230d9e9192ea3dfd (diff) | |
| download | mpv-67b40bd21988fed2f70b1c4f5aea301b28f78298.tar.bz2 mpv-67b40bd21988fed2f70b1c4f5aea301b28f78298.tar.xz | |
Merge svn changes up to r30065
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -4799,11 +4799,14 @@ EOF _gl=no if cc_check -lGL $_ld_lm ; then _gl=yes + _gl_x11=yes libs_mplayer="$libs_mplayer -lGL $_ld_dl" elif cc_check -lGL $_ld_lm $_ld_pthread ; then _gl=yes + _gl_x11=yes libs_mplayer="$libs_mplayer -lGL $_ld_pthread $_ld_dl" - elif cc_check -DGL_WIN32 -lopengl32 ; then + fi + if cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" @@ -4813,14 +4816,20 @@ else fi if test "$_gl" = yes ; then def_gl='#define CONFIG_GL 1' + _res_comment="backends:" if test "$_gl_win32" = yes ; then - def_gl_win32='#define GL_WIN32 1' - _res_comment="win32 version" + def_gl_win32='#define CONFIG_GL_WIN32 1' + _res_comment="$_res_comment win32" + fi + if test "$_gl_x11" = yes ; then + def_gl_x11='#define CONFIG_GL_X11 1' + _res_comment="$_res_comment x11" fi _vomodules="opengl $_vomodules" else def_gl='#undef CONFIG_GL' - def_gl_win32='#undef GL_WIN32' + def_gl_win32='#undef CONFIG_GL_WIN32' + def_gl_x11='#undef CONFIG_GL_X11' _novomodules="opengl $_novomodules" fi echores "$_gl" @@ -7830,6 +7839,7 @@ GIF = $_gif GGI = $_ggi GL = $_gl GL_WIN32 = $_gl_win32 +GL_X11 = $_gl_x11 HAVE_POSIX_SELECT = $_posix_select HAVE_SYS_MMAN_H = $_mman IVTV = $_ivtv @@ -8302,6 +8312,7 @@ $def_gif_4 $def_gif_tvt_hack $def_gl $def_gl_win32 +$def_gl_x11 $def_ivtv $def_jpeg $def_kva |