diff options
author | Kent Mein <mein@cs.umn.edu> | 2007-12-05 19:58:52 +0300 |
---|---|---|
committer | Kent Mein <mein@cs.umn.edu> | 2007-12-05 19:58:52 +0300 |
commit | 7b2e348d4f0252470f0ee484d812a264d5a86fc3 (patch) | |
tree | f45b343af1600761ff269dca18a7b0d4f3b2cdcc /source/gameengine | |
parent | b3c1e458b43d4014bc720c7eb20af5e02f6f5ab5 (diff) |
This is a modified version of this patch:
[#7660] Solaris 10 x86 support (Makefiles)
Hopefully it will not mess up anything for anyone else. I removed
some hardcoded static libs and made NAN_*_LIB definitions so they could be
overridden, to allow greater flexability.
Let me know if there are any problems/questions.
Kent
Diffstat (limited to 'source/gameengine')
8 files changed, 32 insertions, 0 deletions
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 8f7609aed74..413b16bc300 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -54,8 +54,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h" #include "RAS_OpenGLRasterizer/ARB_multitexture.h" #include "BL_Material.h" // MAXTEX diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp index 5b3c2c84edb..840230902f8 100644 --- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp +++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp @@ -43,8 +43,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 0d2aa774394..4f6c78a0fd8 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -46,8 +46,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #include "GPG_Application.h" diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index ab0479eb88b..3b74b74727a 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -9,8 +9,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #include <iostream> #include "BL_Shader.h" diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index d6b57f062f2..53e1af46e4e 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -8,8 +8,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #include <iostream> #include <map> diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index fa1c67f251c..c3aa83bec69 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -15,8 +15,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #include "KX_BlenderMaterial.h" #include "BL_Material.h" diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 1a3a0490d21..1a6aafafabf 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -44,8 +44,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #ifdef WIN32 #pragma warning (disable : 4786) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 85250fcd552..4f9c3a1bfb3 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -46,8 +46,12 @@ #include <OpenGL/glu.h> #else #include <GL/gl.h> +#if defined(__sun__) && !defined(__sparc__) +#include <mesa/glu.h> +#else #include <GL/glu.h> #endif +#endif #include "RAS_Rect.h" #include "RAS_TexVert.h" |