Mercurial > mplayer.hg

diff libvo/gl_common.h @ 30021:7f09bc7a4279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the check for X11 and WIN32 backends for OpenGL separate. This fixes compilation on Windows with X11 but no GLX available.
author reimar
date Sat, 19 Dec 2009 10:52:32 +0000
parents 092c1689c9df
children b7a703cf9178
line wrap: on
line diff
--- a/libvo/gl_common.h	Fri Dec 18 20:27:35 2009 +0000
+++ b/libvo/gl_common.h	Sat Dec 19 10:52:32 2009 +0000
@@ -32,7 +32,7 @@
 #include <GL/gl.h>
 #include "w32_common.h"
 #endif
-#ifdef CONFIG_X11
+#ifdef GL_X11
 #include <GL/gl.h>
 #include <X11/Xlib.h>
 #include <GL/glx.h>
@@ -362,7 +362,7 @@
   enum MPGLType type;
   union {
     int w32;
-#ifdef CONFIG_X11
+#ifdef GL_X11
     XVisualInfo *x11;
 #endif
   } vinfo;
@@ -370,7 +370,7 @@
 #ifdef GL_WIN32
     HGLRC w32;
 #endif
-#ifdef CONFIG_X11
+#ifdef GL_X11
     GLXContext x11;
 #endif
   } context;