Use Cocoa on Mac OS X.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index ad248e129818632eeb1d268d1dc406c1664938a3..7235d6241a698609175a937dc4564e8f100967f0 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -31,6 +31,19 @@
 #define _GLIMPORTS_HPP_
 
 
+// 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
@@ -38,25 +51,25 @@
 #endif
 
 #include <windows.h>
+#include <GL/gl.h>
 
 #elif defined(__APPLE__)
 
+#include <OpenGL/gl.h>
+
 #else
 
 #include <X11/Xlib.h>
+#include <GL/gl.h>
 
 #endif /* !_WIN32 */
 
 
-// Prevent including system's glext.h
-#define __glext_h_
-
-#include <GL/gl.h>
-
+// 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
@@ -94,9 +107,16 @@ typedef struct _WGLSWAP
 #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" {
 
-typedef int CGSConnectionID;
+// From http://www.opensource.apple.com/source/gdb/gdb-954/libcheckpoint/cpcg.c
+typedef void * CGSConnectionID;
 typedef int CGSWindowID;
 typedef int CGSSurfaceID;