diff include/SDL_opengl.h @ 3241:08c5964f2a34

Fixed a few issues compiling with Mac OS X 10.6 Unfortunately the audio and cdrom systems do not build at all, and if you disable those, SDL still fails to link with these errors: Undefined symbols: "_OBJC_IVAR_$_NSScreen._frame", referenced from: -[NSScreen(NSScreenAccess) setFrame:] in SDL_cocoamodes.o "_KLGetKeyboardLayoutProperty", referenced from: _UpdateKeymap in SDL_cocoakeyboard.o _UpdateKeymap in SDL_cocoakeyboard.o "_KLGetCurrentKeyboardLayout", referenced from: _UpdateKeymap in SDL_cocoakeyboard.o ld: symbol(s) not found
author Sam Lantinga <slouken@libsdl.org>
date Sat, 05 Sep 2009 07:33:54 +0000
parents 6c4736b446e8
children d3baf5ac4e37
line wrap: on
line diff
--- a/include/SDL_opengl.h	Sat Sep 05 07:13:01 2009 +0000
+++ b/include/SDL_opengl.h	Sat Sep 05 07:33:54 2009 +0000
@@ -22,6 +22,9 @@
 
 /* This is a simple file to encapsulate the OpenGL API headers */
 
+#ifndef _SDL_opengl_h
+#define _SDL_opengl_h
+
 #include "SDL_config.h"
 
 #ifdef __WIN32__
@@ -37,6 +40,7 @@
 #if defined(__MACOSX__)
 #include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
 #include <OpenGL/glu.h>         /* Header File For The GLU Library */
+#define __X_GL_H
 #else
 #include <GL/gl.h>              /* Header File For The OpenGL Library */
 #include <GL/glu.h>             /* Header File For The GLU Library */
@@ -9307,3 +9311,7 @@
 #endif
 /* *INDENT-ON* */
 #endif /* NO_SDL_GLEXT */
+
+#endif /* _SDL_opengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */