diff options
| author | Jean-Luc Peurière <jlp@nerim.net> | 2008-04-29 20:22:13 +0400 |
|---|---|---|
| committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-04-29 20:22:13 +0400 |
| commit | b6a6507ddfac721f6184f6b0889089d975f35210 (patch) | |
| tree | f4d41448d6818b76aa2398a0a49bd453ef5c966d /source/gameengine/Rasterizer | |
| parent | 17d83bfefbf4376916c7acdc58262fb6b37ac636 (diff) | |
getting ARB shaders working again in GE.
This is is a kludge, and only to get a release
working. later solution is to use glew
Diffstat (limited to 'source/gameengine/Rasterizer')
3 files changed, 3 insertions, 4 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index 05eb73b315f..a18ed038f35 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -35,7 +35,6 @@ # include <GL/gl.h> #elif defined(__APPLE__) -# define __glext_h_ # define GL_GLEXT_LEGACY 1 # include <OpenGL/gl.h> # include <OpenGL/glu.h> @@ -52,8 +51,8 @@ #ifdef WIN32 # include <GL/glext.h> #elif defined(__APPLE__) +# include "mac_compat_glext.h" # include <OpenGL/glext.h> -# undef __glext_h_ # else # include <GL/glext.h> # endif diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index b4d5b8b71de..f2d2e977668 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -6,7 +6,7 @@ if env['WITH_BF_GLEXT'] == 1: sources = env.Glob('*.cpp') #'RAS_GLExtensionManager.cpp RAS_ListRasterizer.cpp RAS_OpenGLRasterizer.cpp RAS_VAOpenGLRasterizer.cpp' -incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer' +incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines' incs += ' ' + env['BF_OPENGL_INC'] env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] ) diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index c71e371fedc..ff79a5d97b8 100644 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -7,7 +7,7 @@ if env['WITH_BF_GLEXT'] == 1: env['CPPFLAGS'].append('-DWITH_GLEXT') -incs = '. #source/kernel/gen_system #intern/string #intern/moto/include' +incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines' if env['OURPLATFORM']=='win32-vc': cflags = [] |