Merged 15170:15635 from trunk (no conflicts or even merges)
[blender.git] / source / gameengine / GamePlayer / common / GPC_Canvas.h
index bd66c865988263cb003051c06d66633ff6eb8117..f82166dfa8894357bcd81c4db33c95b58686523b 100644 (file)
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
 
-#if defined(WIN32) || defined(__APPLE__)
-       #ifdef WIN32
-               #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-               #include <windows.h>
-               #include <GL/gl.h>
-       #else // WIN32
-               // __APPLE__ is defined
-               #include <AGL/gl.h>
-       #endif // WIN32
-#else //defined(WIN32) || defined(__APPLE__)
-       #include <GL/gl.h>
-#endif //defined(WIN32) || defined(__APPLE__)
+#ifdef WIN32
+       #pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+       #include <windows.h>
+#endif // WIN32
+
+#include "GL/glew.h"
 
 #include <map>