diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-05-11 01:22:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-05-11 01:22:25 +0400 |
| commit | a6721e549d560c12c07a6a0f14ada3c429d4bc79 (patch) | |
| tree | 80259e17b4dead0c42605ec2488a59b22c60b1e8 | |
| parent | 386122ada6432b29437c3ca7f1eea2b5b919d377 (diff) | |
changes to get benoits logic updates building on scons with gcc
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/Expressions/SConscript | 2 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/SConscript | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KXNetwork/SConscript | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index 76b8540118a..5d3db25b9ed 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -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); } } diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index 9d6823e3879..12d4a163c86 100644 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -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 = [] diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index 189c39ee237..aadc4154298 100644 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -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'] diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index 26f95fab8af..9dc68669b4a 100644 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -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'] |