diff options
| author | José Fonseca <jose.r.fonseca@gmail.com> | 2011-06-06 21:06:29 +0100 |
|---|---|---|
| committer | José Fonseca <jose.r.fonseca@gmail.com> | 2011-06-06 21:06:29 +0100 |
| commit | e8fec0f0799ea8f5c223578ba181675bb903bf38 (patch) | |
| tree | 2ad78fbd6b81d9c55641c0f34f6a33c9b5a26ce7 /glimports.hpp | |
| parent | f7bd92362651b46d2a00a7044c9cce8d21540b26 (diff) | |
More accurate include/linkage in Mac OS X.
A bit of a mess because unfortunately we depend on GLX to retrace on MacOSX.
Diffstat (limited to 'glimports.hpp')
| -rw-r--r-- | glimports.hpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/glimports.hpp b/glimports.hpp index ad248e1..dce248a 100644 --- 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 |