Attempt to fix guardedalloc on OSX
[blender.git] / intern / guardedalloc / SConscript
index eb558763dbeac52c9cbb8efe809514acff95c33e..3bae808cc943a19c1d0fbf382fce0dd2880f493a 100644 (file)
@@ -29,15 +29,17 @@ Import('env')
 
 defs = []
 
-sources = ['intern/mallocn.c', 'intern/mmap_win.c']
-
-# could make this optional
-defs.append('WITH_GUARDEDALLOC')
+sources = [
+    'intern/mallocn.c', 
+    'intern/mallocn_guarded_impl.c',
+       'intern/mallocn_lockfree_impl.c',
+    'intern/mmap_win.c'
+]
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     sources.append('cpp/mallocn.cpp')
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-incs = '.'
+incs = '. ../atomic'
 
 env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] )