diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2009-11-16 02:48:21 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2009-11-16 02:48:21 +0300 |
| commit | 349fa813eaf413cd2f472e545e7ce2cb6b087b1c (patch) | |
| tree | ce5bc334e2c3f6119b5e684a481962faa85b8585 /source/gameengine | |
| parent | fb4e3a13fcb1028e519cf12ce59f6096359e3ee1 (diff) | |
bpplayer compiling fixes: ([#19890] Getting the Blenderplayer to build again by Mitchel Stokes (moguri) and some changes form mine)
1) SetDisplayArea was created in Blender but we forgot to set it in the player
2) Fix some SCons incs (using lists instead of strings)
3) added more nasty stubs calls (this file is getting big)
* typo fix from last commit
**) it's raining with bolts here and I have to turn the internet off. I couldnt hard test this commit but it looks like working. sorry if sometihng go wrong
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_Canvas.h | 7 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/SConscript | 2 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/SConscript | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index 87719041f65..a65bad59d60 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -125,10 +125,11 @@ public: return m_displayarea; }; - RAS_Rect & - GetDisplayArea( + void + SetDisplayArea( + RAS_Rect *rect ) { - return m_displayarea; + m_displayarea= *rect; }; RAS_Rect & diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 99eda4cb592..51fc2fc7334 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -61,7 +61,7 @@ incs = ['.', defs = [] if env['WITH_BF_PYTHON']: - incs += ' ' + env['BF_PYTHON_INC'] + incs += Split(env['BF_PYTHON_INC']) else: defs.append('DISABLE_PYTHON') diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index cfb827cf8c3..93769e60401 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -43,7 +43,7 @@ incs = ['.', defs = [] if env['WITH_BF_PYTHON']: - incs += ' ' + env['BF_PYTHON_INC'] + incs += Split(env['BF_PYTHON_INC']) else: defs.append('DISABLE_PYTHON') |