Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11gl_c.h @ 1361:19418e4422cb
New configure-based build system. Still work in progress, but much improved
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 16 Feb 2006 10:11:48 +0000 |
| parents | e94b0d7c33bc |
| children | d910939febfa |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11gl_c.h Fri Feb 10 07:29:08 2006 +0000 +++ b/src/video/x11/SDL_x11gl_c.h Thu Feb 16 10:11:48 2006 +0000 @@ -20,21 +20,17 @@ slouken@libsdl.org */ -#ifdef HAVE_OPENGL_X11 +#if SDL_VIDEO_OPENGL_GLX #include <GL/glx.h> -#ifdef USE_DLOPEN -#include <dlfcn.h> -#else #include "SDL_loadso.h" #endif -#endif -#include "SDL_sysvideo.h" +#include "../SDL_sysvideo.h" struct SDL_PrivateGLData { int gl_active; /* to stop switching drivers while we have a valid context */ -#ifdef HAVE_OPENGL_X11 +#if SDL_VIDEO_OPENGL_GLX GLXContext glx_context; /* Current GL context */ XVisualInfo* glx_visualinfo; /* XVisualInfo* returned by glXChooseVisual */ @@ -75,7 +71,7 @@ int screen ); -#endif /* HAVE_OPENGL_X11 */ +#endif /* SDL_VIDEO_OPENGL_GLX */ }; /* Old variable names */ @@ -88,7 +84,7 @@ extern int X11_GL_CreateWindow(_THIS, int w, int h); extern int X11_GL_CreateContext(_THIS); extern void X11_GL_Shutdown(_THIS); -#ifdef HAVE_OPENGL_X11 +#if SDL_VIDEO_OPENGL_GLX extern int X11_GL_MakeCurrent(_THIS); extern int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value); extern void X11_GL_SwapBuffers(_THIS);