Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-01-06 12:02:53 +0300
committerErwin Coumans <blender@erwincoumans.com>2006-01-06 12:02:53 +0300
commit0002cd63a5fb4dd6b5c8e3dfcbe95bf03c7cd23c (patch)
treebfe8285d1a1ede55b1ce1511136ca72cbb6e0be7 /source/gameengine/Converter
parent32a64604bc31f3379b440abd694d9fcd18ede7f4 (diff)
disable game engine and gameplayer for all platforms except windows.
Then after cvs is unfrozen, development can continue.
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_Shader.cpp5
-rwxr-xr-xsource/gameengine/Converter/SConscript1
2 files changed, 5 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_Shader.cpp b/source/gameengine/Converter/BL_Shader.cpp
index c957241b5e4..f97cc821d19 100644
--- a/source/gameengine/Converter/BL_Shader.cpp
+++ b/source/gameengine/Converter/BL_Shader.cpp
@@ -132,7 +132,10 @@ bool BL_Shader::LinkProgram()
void BL_Shader::printInfo(unsigned int pr)
{
#ifdef GL_ARB_shader_objects
- int length=0;
+#ifndef GLcharARB
+typedef char GLcharARB;
+#endif
+int length=0;
glGetObjectParameterivARB(pr, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
if(length > 1)
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index 40c51da47c3..65b3d9d0a9d 100755
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -47,6 +47,7 @@ kx_converter_env.Append (CPPPATH = ['.',
'#source/blender/include',
'#source/blender/makesdna',
'#source/gameengine/Rasterizer',
+ '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
'#source/gameengine/GameLogic',
'#source/gameengine/Expressions',
'#source/gameengine/Network',