diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index fe3abb7eaff..ef6c6b49266 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -5,4 +5,4 @@ Import('env') sources = env.Glob('intern/*.c') incs = '.' -env.BlenderLib ('bf_guardedalloc', sources, Split(incs), [], libtype=['intern', 'player'], priority = [10, 175] ) +env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern', 'player'], priority = [10, 175] ) 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)