diff options
| -rw-r--r-- | source/blender/include/BIF_gl.h | 8 | ||||
| -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 |
5 files changed, 17 insertions, 13 deletions
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h index 8fa305362af..558e954c1eb 100644 --- a/source/blender/include/BIF_gl.h +++ b/source/blender/include/BIF_gl.h @@ -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 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 |