merge with 2.5 at 19207, plus some half-finished walker stuff
[blender.git] / source / blender / makesrna / intern / SConscript
index 330153f0a7f3304a3fd12ced02f5b8978e2457b5..ac05eab14d145657f97d58f59ce93c76296f92f0 100644 (file)
@@ -2,10 +2,12 @@
 import sys
 import os
 
+ap = os.path.abspath
+
 Import ('env')
 cflags = '-Wall'
 defines = []
-root_build_dir=env['BF_BUILDDIR']
+root_build_dir=ap(env['BF_BUILDDIR'])
 
 source_files = env.Glob('*.c')
 
@@ -74,17 +76,17 @@ 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 = ap(root_build_dir + '/source/blender/makesrna/intern') + "/"
 
 if env['OURPLATFORM'] != 'linuxcross':
-    rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna " + build_dir)
+    rna.Command (generated_files, '', ap(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, '', ap(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)
+        rna.Command (generated_files, '', ap('wine ' + root_build_dir+os.sep+"makesrna.exe") + " \""  + build_dir + "\"")
     else:
-        rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
+        rna.Command (generated_files, '', ap(root_build_dir+os.sep+"makesrna.exe") + " \""  + build_dir + "\"")
 
 
 obj = ['intern/rna_access.c', 'intern/rna_dependency.c']