summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-06 13:38:00 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-08-06 13:38:00 +0000
commit9b53e64cc52b7693a714c884313bc74b50ebb910 (patch)
tree53b92ae547338e76604d741b0e7fea59efcd3aa9
parent55db3a576002dba96360482033e54e95856266f2 (diff)
downloadmpv-9b53e64cc52b7693a714c884313bc74b50ebb910.tar.bz2
mpv-9b53e64cc52b7693a714c884313bc74b50ebb910.tar.xz
Forgot to actually enable vo_gl on Windows...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16182 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure5
-rw-r--r--libvo/video_out.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index b167043001..7120b61f8a 100755
--- a/configure
+++ b/configure
@@ -3805,11 +3805,10 @@ else
fi
if test "$_gl" = yes ; then
_def_gl='#define HAVE_GL 1'
+ _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
if test "$_gl_win32" = yes ; then
_def_gl_win32='#define GL_WIN32 1'
- _vosrc="$_vosrc vo_gl2.c w32_common.c gl_common.c"
- else
- _vosrc="$_vosrc vo_gl.c vo_gl2.c gl_common.c"
+ _vosrc="$_vosrc w32_common.c"
fi
_vomodules="opengl $_vomodules"
else
diff --git a/libvo/video_out.c b/libvo/video_out.c
index da86342f06..9ce90a9d86 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -173,9 +173,7 @@ vo_functions_t* video_out_drivers[] =
&video_out_xover,
#endif
#ifdef HAVE_GL
- #ifndef GL_WIN32
&video_out_gl,
- #endif
&video_out_gl2,
#endif
#ifdef HAVE_DGA