Enable CXX_GUARDEDALLOC support through SCons.

2010-10-08 20:39:56 +00:00
parent 48d2aac250
commit 663ce490e0
15 changed files with 71 additions and 7 deletions
--- 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] )