diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-10 09:34:42 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-10 09:34:42 +0300 |
| commit | b7be6620d6ecfbec1d82128f402b585041910ca9 (patch) | |
| tree | c43c034f4f9b79a46d68b6fe191f2b0644aad494 /source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h | |
| parent | 95355efec9406b6681c3f1b7852712349ad82dd9 (diff) | |
applied patch from snailrose, related to multi-platform OpenGL extensions.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index f91b50e39bf..2d862ea3853 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -33,11 +33,22 @@ #define __RAS_GLEXTENSIONMANAGER_H__ +#ifdef WIN32 +# include <windows.h> +# include <GL/gl.h> -#ifdef __APPLE__ -#include <OpenGL/gl.h> -#else -#include <GL/gl.h> +#elif defined(__APPLE__) +# define __glext_h_ +# include <OpenGL/gl.h> +# include <OpenGL/glu.h> +# undef __glext_h_ + +#else /* UNIX */ +# define __glext_h_ +# include <GL/gl.h> +# include <GL/glx.h> +# undef GL_ARB_multitexture // (ubuntu) +# undef __glext_h_ #endif #include "glext.h" |