changes to get benoits logic updates building on scons with gcc
authorCampbell Barton <ideasman42@gmail.com>
Sun, 10 May 2009 21:22:25 +0000 (21:22 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 10 May 2009 21:22:25 +0000 (21:22 +0000)
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Expressions/SConscript
source/gameengine/GameLogic/SConscript
source/gameengine/Ketsji/KXNetwork/SConscript

index 76b8540118a3da2c3c7ca619c4c8805266aa2772..5d3db25b9ed181572f4078ad867da260dc7632b9 100644 (file)
@@ -1105,7 +1105,8 @@ void BL_ConvertActuators(char* maggiename,
                                buf = txt_to_buf(_2dfilter->text);
                                if (buf)
                                {
-                                       tmp->SetShaderText(STR_String(buf));
+                                       STR_String buf_str= buf;
+                                       tmp->SetShaderText(buf_str);
                                        MEM_freeN(buf);
                                }
                        }
index 9d6823e38795fb4899e5a25a5ae1ea92fb6492ea..12d4a163c86523d2826e9545189142b21c28889f 100644 (file)
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = env.Glob('*.cpp')
 
-incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Scenegraph'
+incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph'
 incs += ' ' + env['BF_PYTHON_INC']
 
 cxxflags = []
index 189c39ee23765276c8d100729d378e9ae44a4755..aadc415429878242e5128371e4ff1d16be52efa6 100644 (file)
@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') + env.Glob('Joystick/*.cpp')
 
 incs = '. #/source/kernel/gen_system #/intern/string'
 incs += ' #/source/gameengine/Expressions #/intern/moto/include'
-incs += ' #/source/gameengine/Rasterizer #/source/gameengine/Scenegraph'
+incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 
index 26f95fab8afa9352f51e1e9559e069f88a186997..9dc68669b4a165a8feea4bd2f813a7d40d4fd536 100644 (file)
@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Ketsji'
 incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions'
-incs += ' #source/gameengine/Network #source/gameengine/Scenegraph'
+incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']