diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-03-08 10:15:41 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-03-08 10:15:41 +0300 |
commit | 0c5032ebf3124edce9d19bc0464ef1b3d4a04828 (patch) | |
tree | 824a4dfae826be70e0358f67e252f622f2b958dd /source/blender/makesdna/intern/SConscript | |
parent | 57c37cf10c4037ab66b06802169a7b2008e51013 (diff) | |
parent | d0267ccf6dffa0b7dafa85f6db8ff03251dbb8df (diff) |
merge with 2.5 at 19207, plus some half-finished walker stuff
Diffstat (limited to 'source/blender/makesdna/intern/SConscript')
-rw-r--r-- | source/blender/makesdna/intern/SConscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 4aa8d6a9d54..6c8f48da251 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -42,18 +42,22 @@ targetdir = root_build_dir + '/makesdna' if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetdir = '#' + targetdir + #root_build_dir = "#" makesdna = makesdna_tool.Program (target = targetdir, source = source_files, LIBS=['bf_guardedalloc']) dna_dict = dna.Dictionary() dna.Depends ('dna.c', makesdna) dna.Depends ('dna.c', header_files) + +ap = os.path.abspath + if env['OURPLATFORM'] != 'linuxcross': if USE_WINE: - dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET") + dna.Command ('dna.c', '', 'wine ' + ap(root_build_dir+os.sep+"makesdna $TARGET")) else: - dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET") + dna.Command ('dna.c', '', ap(root_build_dir+os.sep+"makesdna $TARGET")) else: - dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET") + dna.Command ('dna.c', '', ap(root_build_dir+os.sep+"makesdna.exe $TARGET")) obj = ['intern/dna.c', 'intern/dna_genfile.c'] Return ('obj') |