[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14317] trunk/blender/source: This commit reverts the #include <mesa/glu.h>

[Kent Mein]

Revision: 14317
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14317
Author:   sirdude
Date:     2008-04-02 17:03:03 +0200 (Wed, 02 Apr 2008)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_gl.h
    trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
    trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
    trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/source/blender/include/BIF_gl.h
===================================================================
--- trunk/blender/source/blender/include/BIF_gl.h	2008-04-02 12:56:23 UTC (rev 14316)
+++ trunk/blender/source/blender/include/BIF_gl.h	2008-04-02 15:03:03 UTC (rev 14317)
@@ -56,20 +56,22 @@
  #include <OpenGL/gl.h>
  #include <OpenGL/glu.h>
 #else
- #if defined (__sun) || defined (__sun__)
+/*  #if defined (__sun) || defined (__sun__)
   #include <GL/gl.h>
   #include <mesa/glu.h>
  #else
+*/
   #include <GL/gl.h>
   #include <GL/glu.h>
- #endif
+/* #endif */
 #endif
+
+
 	/*
 	 * these should be phased out. cpack should be replaced in
 	 * code with calls to glColor3ub, lrectwrite probably should
 	 * change to a function. - zr
 	 */
-	 
 /* 
  *
  * This define converts a numerical value to the equivalent 24-bit

Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp	2008-04-02 12:56:23 UTC (rev 14316)
+++ trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp	2008-04-02 15:03:03 UTC (rev 14317)
@@ -9,12 +9,13 @@
 #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>
 #include "BL_Shader.h"

Modified: trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp	2008-04-02 12:56:23 UTC (rev 14316)
+++ trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp	2008-04-02 15:03:03 UTC (rev 14317)
@@ -8,12 +8,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
+#else */
 #include <GL/glu.h>
+/* #endif */
 #endif
-#endif
 
 #include <iostream>
 #include <map>

Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp	2008-04-02 12:56:23 UTC (rev 14316)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp	2008-04-02 15:03:03 UTC (rev 14317)
@@ -15,12 +15,13 @@
 #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"
 #include "BL_Material.h"

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2008-04-02 12:56:23 UTC (rev 14316)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2008-04-02 15:03:03 UTC (rev 14317)
@@ -44,12 +44,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
+#else */
 #include <GL/glu.h>
+/* #endif */
 #endif
-#endif
 
 #ifdef WIN32
 #pragma warning (disable : 4786)