From b7be6620d6ecfbec1d82128f402b585041910ca9 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <blender@erwincoumans.com>
Date: Tue, 10 Jan 2006 06:34:42 +0000
Subject: applied patch from snailrose, related to multi-platform OpenGL
 extensions.

---
 .../RAS_OpenGLRasterizer/RAS_GLExtensionManager.h     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h')

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
index f91b50e39bf..2d862ea3853 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
@@ -33,11 +33,22 @@
 #define __RAS_GLEXTENSIONMANAGER_H__
 
 
+#ifdef WIN32
+#  include <windows.h>
+#  include <GL/gl.h>
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
+#elif defined(__APPLE__)
+#  define __glext_h_
+#  include <OpenGL/gl.h>
+#  include <OpenGL/glu.h>
+#  undef __glext_h_
+
+#else /* UNIX */
+#  define __glext_h_
+#  include <GL/gl.h>
+#  include <GL/glx.h>
+#  undef GL_ARB_multitexture // (ubuntu)
+#  undef __glext_h_
 #endif
 
 #include "glext.h"
-- 
cgit v1.2.3