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:
authorMitchell Stokes <mogurijin@gmail.com>2010-09-01 03:55:41 +0400
committerMitchell Stokes <mogurijin@gmail.com>2010-09-01 03:55:41 +0400
commitd67eedcef9a4fb34f29513bc0dd21b97ea9567be (patch)
tree8cf09942213b5da3c9522bdea4acc3c3aee3240d /source/blenderplayer
parenta41c0a55d5e444e7a4895727d397da04d4b40c53 (diff)
Adding intern/guardedalloc include dir for bad_level_call_stubs (stubs.c). This update is for cmake and scons.
This is needed since RNA_types.h now includes BLO_sys_types.h
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/CMakeLists.txt3
-rw-r--r--source/blenderplayer/bad_level_call_stubs/SConscript3
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index 9a53997fd66..dbcf4d96942 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -34,8 +34,9 @@ ENDIF(WITH_BUILDINFO)
SET(INC
.
..
+ ../../../intern/guardedalloc
../../../source/blender/makesdna
- ../../../source/blender/makesrna
+ ../../../source/blender/makesrna
)
IF(WITH_GAMEENGINE)
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index aec5bb58ef7..5d71f83719f 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -3,7 +3,8 @@ Import ('env')
sources = 'stubs.c'
-incs = '#/source/blender/makesdna'
+incs = '#/intern/guardedalloc'
+incs += ' #/source/blender/makesdna'
incs += ' #/source/blender/makesrna'
defs = ''