X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glimports.hpp;h=1da1261968487e0e9c6944b8e4306551198f049f;hb=c8f8ce861635eafe8c7a60a7bb245358d8b2d162;hp=7207523fdfa65c3018301a3598ab50b5d714931b;hpb=59ee88ea99b6de592b32d635e097a759b7f70e23;p=apitrace diff --git a/glimports.hpp b/glimports.hpp index 7207523..1da1261 100644 --- a/glimports.hpp +++ b/glimports.hpp @@ -31,7 +31,8 @@ #define _GLIMPORTS_HPP_ -// Prevent including system's glext.h +// Prevent including MacOSX's glext.h which lives in OpenGL/glext.h and not +// GL/glext.h #define __glext_h_ @@ -76,7 +77,7 @@ // Include our own glext.h #undef __glext_h_ -#include "glext/glext.h" +#include #ifndef GL_TEXTURE_INDEX_SIZE_EXT @@ -86,7 +87,7 @@ #if defined(_WIN32) -#include "glext/wglext.h" +#include #define GLAPIENTRY __stdcall @@ -139,7 +140,7 @@ CGLError CGLUpdateContext(CGLContextObj ctx); #ifdef HAVE_X11 #include -#include "glext/glxext.h" +#include #endif /* Prevent collision with trace::Bool */