diff options
author | Kent Mein <mein@cs.umn.edu> | 2008-04-02 19:03:03 +0400 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2008-04-02 19:03:03 +0400 |
commit | b73ba9c1812d90ecdd9d76d3347843cbd26327bb (patch) | |
tree | c72c5ad2da08c544fca7a8483ca361edce6d28a4 /source/gameengine | |
parent | 04be9955d09b746ce0ebf1f4295f3cb226674d00 (diff) |
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
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 5 | ||||
-rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 5 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 6 |
4 files changed, 12 insertions, 10 deletions
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 |