More accurate include/linkage in Mac OS X.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index ad248e129818632eeb1d268d1dc406c1664938a3..dce248a2649bc87caf721f2d7db8243595871c2f 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -31,6 +31,10 @@
 #define _GLIMPORTS_HPP_
 
 
+// Prevent including system's glext.h
+#define __glext_h_
+
+
 #if defined(_WIN32)
 
 #ifndef WIN32_LEAN_AND_MEAN
@@ -38,25 +42,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