#define _GLIMPORTS_HPP_
+// Prevent including system's glext.h
+#define __glext_h_
+
+
#if defined(_WIN32)
#ifndef WIN32_LEAN_AND_MEAN
#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
#elif defined(__APPLE__)
#include <OpenGL/OpenGL.h>
+#include <OpenGL/CGLIOSurface.h>
+#include <OpenGL/CGLDevice.h>
+
+extern "C" {
+
+typedef int 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