=== SCons ==

* fix by Malcolm Tredinnick for #6148
* some other misc changes by myself.
This commit is contained in:
Nathan Letwory 2007-03-05 06:38:30 +00:00
parent ef900ced64
commit b3d8c7a97a

@ -11,7 +11,7 @@ source_files = ['makesdna.c', '#intern/guardedalloc/intern/mallocn.c']
makesdna_tool = env.Copy() makesdna_tool = env.Copy()
dna = env.Copy() dna = env.Copy()
makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append(CCFLAGS = ' -DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
'../../makesdna']) '../../makesdna'])
@ -26,11 +26,13 @@ if sys.platform != 'cygwin':
makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (CPPDEFINES = defines)
makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib')
makesdna_tool.Program (target = '#'+root_build_dir+os.sep+'makesdna', source = source_files) if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep:
makesdna = makesdna_tool.Program (target = root_build_dir+'/makesdna', source = source_files)
else:
makesdna = makesdna_tool.Program (target = '#'+root_build_dir+'/makesdna', source = source_files)
dna_dict = dna.Dictionary() dna_dict = dna.Dictionary()
makesdna_name = root_build_dir+'/makesdna' + dna_dict['PROGSUFFIX'] dna.Depends ('dna.c', makesdna)
dna.Depends ('dna.c', '#'+makesdna_name)
if env['OURPLATFORM'] != 'linuxcross': if env['OURPLATFORM'] != 'linuxcross':
dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
else: else: