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:
authorNathan Letwory <nathan@letworyinteractive.com>2010-10-09 00:39:56 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2010-10-09 00:39:56 +0400
commit663ce490e0174a90ba3e4ed6f3468301d593958a (patch)
treef01622031f002343f80e8479ea54cd37a5128ec9 /intern/string
parent48d2aac250624664cd1db77470af0fc45526f3c9 (diff)
Enable CXX_GUARDEDALLOC support through SCons.
Diffstat (limited to 'intern/string')
-rw-r--r--intern/string/SConscript8
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/string/SConscript b/intern/string/SConscript
index f8342bf12c2..dac0ead8e61 100644
--- a/intern/string/SConscript
+++ b/intern/string/SConscript
@@ -4,4 +4,10 @@ Import ('env')
sources = env.Glob('intern/*.cpp')
incs = '.'
-env.BlenderLib ('bf_intern_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] )
+defs = []
+
+if env['WITH_BF_CXX_GUARDEDALLOC']:
+ defs.append('WITH_CXX_GUARDEDALLOC')
+ incs += ' #intern/guardedalloc'
+
+env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] )