#ifndef _GLIMPORTS_HPP_
#define _GLIMPORTS_HPP_
-#ifdef WIN32
+
+// Prevent including system's glext.h
+#define __glext_h_
+
+// Some functions take GLenum disguised as GLint. Apple noticed and fixed it
+// in the Mac OS X 10.6.x gl.h headers. Regardless, C++ typechecking rules
+// force the wrappers to match the prototype precisely.
+#if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_7)
+#define GLenum_int GLenum
+#else
+#define GLenum_int GLint
+#endif
+
+
+#if defined(_WIN32)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif
#include <windows.h>
+#include <GL/gl.h>
-#else /* !WIN32 */
+#elif defined(__APPLE__)
-#include <X11/Xlib.h>
+#include <OpenGL/gl.h>
-#endif /* !WIN32 */
+#else
+#include <X11/Xlib.h>
#include <GL/gl.h>
-#include <GL/glext.h>
+#endif /* !_WIN32 */
+
+
+// Include our own glext.h
+#undef __glext_h_
+#include "glext/glext.h"
+
#ifndef GL_TEXTURE_INDEX_SIZE_EXT
#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED
#endif
-#ifdef WIN32
-#include <GL/wglext.h>
+#if defined(_WIN32)
+
+#include "glext/wglext.h"
#define GLAPIENTRY __stdcall
#define PFD_SUPPORT_COMPOSITION 0x00008000
#endif
-#ifdef __MINGW32__
+#ifndef WGL_SWAPMULTIPLE_MAX
+extern "C"
typedef struct _WGLSWAP
{
HDC hdc;
#define WGL_SWAPMULTIPLE_MAX 16
-#endif /* __MINGW32__ */
+#endif /* !WGL_SWAPMULTIPLE_MAX */
-#else /* !WIN32 */
+#elif defined(__APPLE__)
+
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/CGLIOSurface.h>
+#include <OpenGL/CGLDevice.h>
+
+#ifndef CGL_VERSION_1_3
+#define kCGLPFAOpenGLProfile 99
+#define kCGLOGLPVersion_Legacy 0x1000
+#define kCGLOGLPVersion_3_2_Core 0x3200
+#endif
+
+extern "C" {
+
+// From http://www.opensource.apple.com/source/gdb/gdb-954/libcheckpoint/cpcg.c
+typedef void * CGSConnectionID;
+typedef int CGSWindowID;
+typedef int CGSSurfaceID;
+
+CGLError CGLSetSurface(CGLContextObj ctx, CGSConnectionID cid, CGSWindowID wid, CGSSurfaceID sid);
+CGLError CGLGetSurface(CGLContextObj ctx, CGSConnectionID* cid, CGSWindowID* wid, CGSSurfaceID* sid);
+CGLError CGLUpdateContext(CGLContextObj ctx);
+
+}
+
+#else
#include <GL/glx.h>
-#include <GL/glext.h>
+#include "glext/glxext.h"
+
+/* Prevent collision with Trace::Bool */
+#undef Bool
+
+#endif
-#endif /* !WIN32 */
#endif /* _GLIMPORTS_HPP_ */