From b73ba9c1812d90ecdd9d76d3347843cbd26327bb Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Wed, 2 Apr 2008 15:03:03 +0000
Subject: This commit reverts the #include <mesa/glu.h> stuff used for peach to
 the standard <GL/glu.h> the mesa stuff was needed for the machines for peach
 but its not the stanard location of the headers, now that its not needed were
 switching it back.

Kent
---
 source/gameengine/Ketsji/BL_Shader.cpp          | 5 +++--
 source/gameengine/Ketsji/BL_Texture.cpp         | 6 +++---
 source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 5 +++--
 source/gameengine/Ketsji/KX_PythonInit.cpp      | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'source/gameengine')

diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 3b74b74727a..3bd5146f28f 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -9,11 +9,12 @@
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
+/* #if defined(__sun__) && !defined(__sparc__)
 #include <mesa/glu.h>
 #else
+*/
 #include <GL/glu.h>
-#endif
+/* #endif */
 #endif
 
 #include <iostream>
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index 53e1af46e4e..f6fb990fd4c 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -8,11 +8,11 @@
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
+/* #if defined(__sun__) && !defined(__sparc__)
 #include <mesa/glu.h>
-#else
+#else */
 #include <GL/glu.h>
-#endif
+/* #endif */
 #endif
 
 #include <iostream>
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index c3aa83bec69..cfdcba8a5d6 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -15,11 +15,12 @@
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
+/* #if defined(__sun__) && !defined(__sparc__)
 #include <mesa/glu.h>
 #else
+*/
 #include <GL/glu.h>
-#endif
+/* #endif */
 #endif
 
 #include "KX_BlenderMaterial.h"
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 58369ddcab6..f3f10ea78b4 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -44,11 +44,11 @@
 #include <OpenGL/glu.h>
 #else
 #include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
+/* #if defined(__sun__) && !defined(__sparc__)
 #include <mesa/glu.h>
-#else
+#else */
 #include <GL/glu.h>
-#endif
+/* #endif */
 #endif
 
 #ifdef WIN32
-- 
cgit v1.2.3