diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-04-16 14:45:21 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-04-16 14:45:21 +0400 |
commit | db7d0108c20332fc55c637e979c65cf55ca37428 (patch) | |
tree | b5c2c1a86095534ac7c9871e23fec6a32eef10bf /source/blender/makesrna/intern/SConscript | |
parent | 079304d199f7619f7eb0e8c256953505df1fcb53 (diff) |
2.5 / SCons
* make sure makesdna and makesrna work on windows in directories with spaces in them.
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
-rw-r--r-- | source/blender/makesrna/intern/SConscript | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index a8cc452d350..83f14b9ef14 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -25,10 +25,10 @@ rna = env.Clone() makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" ') makesrna_tool.Append (CPPPATH = ['#/intern/guardedalloc', - '../../blenlib', - '../../blenkernel', - '../../makesdna', - '../../makesrna', + '../../blenlib', + '../../blenkernel', + '../../makesdna', + '../../makesrna', '../../windowmanager', '../../editors/include']) @@ -44,7 +44,7 @@ if not USE_WINE: makesdna_tool.Replace(LINK='gcc') if sys.platform != 'cygwin': - makesrna_tool.Append (CCFLAGS = cflags) + makesrna_tool.Append (CCFLAGS = cflags) makesrna_tool.Append (CPPDEFINES = defines) libdir = root_build_dir+'/lib' @@ -67,25 +67,28 @@ if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): targetpath = '#' + targetpath if env['OURPLATFORM'] == 'linux2' and root_build_dir[0]==os.sep: - makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) else: - makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) + makesrna = makesrna_tool.Program (target = targetpath, source = source_files, LIBS=['bf_guardedalloc', 'bf_dna']) rna_dict = rna.Dictionary() rna.Depends (generated_files, makesrna) # this seems bad, how to retrieve it from scons? -build_dir = root_build_dir + '/source/blender/makesrna/intern/' +build_dir = root_build_dir + os.sep +'source' + os.sep + 'blender' + os.sep + 'makesrna' + os.sep + 'intern' + os.sep if env['OURPLATFORM'] != 'linuxcross': - rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna " + build_dir) + if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): + rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \"" + build_dir ) + else: + rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna " + build_dir) else: - rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe " + build_dir) + rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe " + build_dir) - if USE_WINE: - rna.Command (generated_files, '', 'wine ' + root_build_dir+os.sep+"makesrna.exe " + build_dir) - else: - rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe " + build_dir) + if USE_WINE: + rna.Command (generated_files, '', 'wine ' + root_build_dir+os.sep+"makesrna.exe " + build_dir) + else: + rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe " + build_dir) obj = ['intern/rna_access.c'] |