Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

=== SCons ===

Browse Source 
Bugfix #6168

* instead of compiling mallocn manually for makesdna, use the bf_guardedalloc lib
 that was already created looooooong time ago.
This commit is contained in:
Nathan Letwory
2007-03-27 10:50:03 +00:00
parent e3ff98fc6b
commit 0326ec77a9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/guardedalloc/SConscript
View File

@@ -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] )

6
source/blender/makesdna/intern/SConscript
View File

@@ -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)