diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2007-03-27 14:50:03 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2007-03-27 14:50:03 +0400 |
| commit | 0326ec77a939e3377e77c5e250848c9ea6362312 (patch) | |
| tree | 872260ccd5be4215af5a6c0baba521d72806bacf /source/blender/makesdna/intern/SConscript | |
| parent | e3ff98fc6ba3e9b2ac8887d43a978e3eb7109cb0 (diff) | |
=== SCons ===
Bugfix #6168
* instead of compiling mallocn manually for makesdna, use the bf_guardedalloc lib
that was already created looooooong time ago.
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 25f86e9ba92..fe712afbeeb 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -7,7 +7,7 @@ cflags = '' defines = [] root_build_dir=env['BF_BUILDDIR'] -source_files = ['makesdna.c', '#intern/guardedalloc/intern/mallocn.c'] +source_files = ['makesdna.c'] makesdna_tool = env.Copy() dna = env.Copy() @@ -27,9 +27,9 @@ makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep: - makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files) + makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc']) else: - makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files) + makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files, LIBS=['bf_guardedalloc']) dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) |