[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19753] branches/blender2.5/blender/source /blender: 2.5 / SCons
Nathan Letwory
jesterking at letwory.net
Thu Apr 16 12:45:22 CEST 2009
Revision: 19753
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19753
Author: jesterking
Date: 2009-04-16 12:45:21 +0200 (Thu, 16 Apr 2009)
Log Message:
-----------
2.5 / SCons
* make sure makesdna and makesrna work on windows in directories with spaces in them.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
Modified: branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/intern/SConscript 2009-04-16 07:37:06 UTC (rev 19752)
+++ branches/blender2.5/blender/source/blender/makesdna/intern/SConscript 2009-04-16 10:45:21 UTC (rev 19753)
@@ -56,7 +56,10 @@
if USE_WINE:
dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET")
else:
- dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
+ dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
+ else:
+ dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
else:
dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
obj = ['intern/dna.c', 'intern/dna_genfile.c']
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript 2009-04-16 07:37:06 UTC (rev 19752)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript 2009-04-16 10:45:21 UTC (rev 19753)
@@ -25,10 +25,10 @@
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 @@
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 @@
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']
More information about the Bf-blender-cvs
mailing list