comparison 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
comparison
equal deleted inserted replaced
3240:6c4736b446e8 3241:08c5964f2a34
20 slouken@libsdl.org 20 slouken@libsdl.org
21 */ 21 */
22 22
23 /* This is a simple file to encapsulate the OpenGL API headers */ 23 /* This is a simple file to encapsulate the OpenGL API headers */
24 24
25 #ifndef _SDL_opengl_h
26 #define _SDL_opengl_h
27
25 #include "SDL_config.h" 28 #include "SDL_config.h"
26 29
27 #ifdef __WIN32__ 30 #ifdef __WIN32__
28 #define WIN32_LEAN_AND_MEAN 31 #define WIN32_LEAN_AND_MEAN
29 #ifndef NOMINMAX 32 #ifndef NOMINMAX
35 #define __glext_h_ /* Don't let gl.h include glext.h */ 38 #define __glext_h_ /* Don't let gl.h include glext.h */
36 #endif 39 #endif
37 #if defined(__MACOSX__) 40 #if defined(__MACOSX__)
38 #include <OpenGL/gl.h> /* Header File For The OpenGL Library */ 41 #include <OpenGL/gl.h> /* Header File For The OpenGL Library */
39 #include <OpenGL/glu.h> /* Header File For The GLU Library */ 42 #include <OpenGL/glu.h> /* Header File For The GLU Library */
43 #define __X_GL_H
40 #else 44 #else
41 #include <GL/gl.h> /* Header File For The OpenGL Library */ 45 #include <GL/gl.h> /* Header File For The OpenGL Library */
42 #include <GL/glu.h> /* Header File For The GLU Library */ 46 #include <GL/glu.h> /* Header File For The GLU Library */
43 #endif 47 #endif
44 #ifndef NO_SDL_GLEXT 48 #ifndef NO_SDL_GLEXT
9305 #endif 9309 #endif
9306 9310
9307 #endif 9311 #endif
9308 /* *INDENT-ON* */ 9312 /* *INDENT-ON* */
9309 #endif /* NO_SDL_GLEXT */ 9313 #endif /* NO_SDL_GLEXT */
9314
9315 #endif /* _SDL_opengl_h */
9316
9317 /* vi: set ts=4 sw=4 expandtab: */