diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-09 00:39:56 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-09 00:39:56 +0400 |
commit | 663ce490e0174a90ba3e4ed6f3468301d593958a (patch) | |
tree | f01622031f002343f80e8479ea54cd37a5128ec9 /intern/guardedalloc | |
parent | 48d2aac250624664cd1db77470af0fc45526f3c9 (diff) |
Enable CXX_GUARDEDALLOC support through SCons.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r-- | intern/guardedalloc/SConscript | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 0c9c7d13608..74d6e07269f 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -2,7 +2,14 @@ Import('env') -sources = env.Glob('intern/*.c') +defs = [] + +sources = ['intern/mallocn.c', 'intern/mmap_win.c'] + +if env['WITH_BF_CXX_GUARDEDALLOC']: + sources.append('cpp/mallocn.cpp') + defs.append('WITH_CXX_GUARDEDALLOC') + incs = '.' -env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] ) +env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] ) |