diff options
Diffstat (limited to 'intern/string/SConscript')
| -rw-r--r-- | intern/string/SConscript | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/string/SConscript b/intern/string/SConscript index f8342bf12c2..f4f44d89403 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,14 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' +<<<<<<< .working 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] ) +>>>>>>> .merge-right.r35190 |