diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2006-07-10 21:04:37 +0000 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2006-07-10 21:04:37 +0000 |
| commit | 6bc598ea612c242fbcafd50b86b31feee01dada1 (patch) | |
| tree | d6fe19c1f8605151b3b800a9158e26f979b96563 /include/SDL_opengl.h | |
| parent | 8f3655506ae41dd1cdb45e1fc1df5b14875575c3 (diff) | |
SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Diffstat (limited to 'include/SDL_opengl.h')
| -rw-r--r-- | include/SDL_opengl.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index 36c0a3099e..32535473a4 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -27,33 +27,35 @@ #ifdef __WIN32__ #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX -#define NOMINMAX /* Don't defined min() and max() */ +#define NOMINMAX /* Don't defined min() and max() */ #endif #include <windows.h> #endif #ifndef NO_SDL_GLEXT -#define __glext_h_ /* Don't let gl.h include glext.h */ +#define __glext_h_ /* Don't let gl.h include glext.h */ #endif #if defined(__MACOSX__) -#include <OpenGL/gl.h> /* Header File For The OpenGL Library */ -#include <OpenGL/glu.h> /* Header File For The GLU Library */ +#include <OpenGL/gl.h> /* Header File For The OpenGL Library */ +#include <OpenGL/glu.h> /* Header File For The GLU Library */ #elif defined(__MACOS__) -#include <gl.h> /* Header File For The OpenGL Library */ -#include <glu.h> /* Header File For The GLU Library */ +#include <gl.h> /* Header File For The OpenGL Library */ +#include <glu.h> /* Header File For The GLU Library */ #else -#include <GL/gl.h> /* Header File For The OpenGL Library */ -#include <GL/glu.h> /* Header File For The GLU Library */ +#include <GL/gl.h> /* Header File For The OpenGL Library */ +#include <GL/glu.h> /* Header File For The GLU Library */ #endif #ifndef NO_SDL_GLEXT #undef __glext_h_ #endif -/* This file taken from "GLext.h" from the Jeff Molofee OpenGL tutorials. - It is included here because glext.h is not available on some systems. +/* This file is included because glext.h is not available on some systems. If you don't want this version included, simply define "NO_SDL_GLEXT" + The latest version is available from: + http://oss.sgi.com/projects/ogl-sample/registry/ */ -#ifndef NO_SDL_GLEXT -#if !defined(__glext_h_) && !defined(GL_GLEXT_LEGACY) +#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY) +/* *INDENT-OFF* */ +#ifndef __glext_h_ #define __glext_h_ #ifdef __cplusplus @@ -6548,4 +6550,5 @@ typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid #endif #endif +/* *INDENT-ON* */ #endif /* NO_SDL_GLEXT */ |