diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2007-03-05 09:38:30 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2007-03-05 09:38:30 +0300 |
| commit | b3d8c7a97aed7c0bf583bc4eabbcc3d5cb631c89 (patch) | |
| tree | 6c446bade75b4675dea2a2a04686d7b573298a84 /source/blender/makesdna/intern/SConscript | |
| parent | ef900ced6459c82559650e74653a4b72d2197e40 (diff) | |
=== SCons ==
* fix by Malcolm Tredinnick for #6148
* some other misc changes by myself.
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 706e57c206d..ae5d446bcc3 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -11,7 +11,7 @@ source_files = ['makesdna.c', '#intern/guardedalloc/intern/mallocn.c'] makesdna_tool = 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']) @@ -26,11 +26,13 @@ if sys.platform != 'cygwin': makesdna_tool.Append (CPPDEFINES = defines) 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() -makesdna_name = root_build_dir+'/makesdna' + dna_dict['PROGSUFFIX'] -dna.Depends ('dna.c', '#'+makesdna_name) +dna.Depends ('dna.c', makesdna) if env['OURPLATFORM'] != 'linuxcross': dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") else: |