2.5 / SCons

* make sure makesdna and makesrna work on windows in directories with spaces in them.

2 files changed, 21 insertions, 15 deletions

diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript
index 6a4c7ddda6c..1c716019e80 100644
--- a/source/blender/makesdna/intern/SConscript
+++ b/source/blender/makesdna/intern/SConscript
@@ -56,7 +56,10 @@ if env['OURPLATFORM'] != 'linuxcross':
 	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']
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']