diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 10:52:32 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-12-19 10:52:32 +0000 |
| commit | 140de2a9e2a7a057ff58254eb3d0eafe0754ae24 (patch) | |
| tree | 01d9133bbabc853a716fcf1a26c7c81d5b5b98cd /libvo/gl_common.h | |
| parent | cb7a098c81c2cd2191faa452d9f025da7a22e1bc (diff) | |
| download | mpv-140de2a9e2a7a057ff58254eb3d0eafe0754ae24.tar.bz2 mpv-140de2a9e2a7a057ff58254eb3d0eafe0754ae24.tar.xz | |
Make the check for X11 and WIN32 backends for OpenGL separate.
This fixes compilation on Windows with X11 but no GLX available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index dc2fe6698f..f149589878 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -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 @@ typedef struct MPGLContext { enum MPGLType type; union { int w32; -#ifdef CONFIG_X11 +#ifdef GL_X11 XVisualInfo *x11; #endif } vinfo; @@ -370,7 +370,7 @@ typedef struct MPGLContext { #ifdef GL_WIN32 HGLRC w32; #endif -#ifdef CONFIG_X11 +#ifdef GL_X11 GLXContext x11; #endif } context; |