[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31396] trunk/blender/source/blender: Scons:

[Joerg Mueller]

Revision: 31396
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31396
Author:   nexyon
Date:     2010-08-16 21:09:42 +0200 (Mon, 16 Aug 2010)

Log Message:
-----------
Scons:
* Should now build again without problems
* Fixed scons having problems to execute makes(d/r)na if build path contains spaces

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sound/SConscript
    trunk/blender/source/blender/editors/space_graph/SConscript
    trunk/blender/source/blender/editors/space_sequencer/SConscript
    trunk/blender/source/blender/makesdna/intern/SConscript
    trunk/blender/source/blender/makesrna/intern/SConscript

Modified: trunk/blender/source/blender/editors/sound/SConscript
===================================================================
--- trunk/blender/source/blender/editors/sound/SConscript	2010-08-16 18:59:36 UTC (rev 31395)
+++ trunk/blender/source/blender/editors/sound/SConscript	2010-08-16 19:09:42 UTC (rev 31396)
@@ -6,8 +6,9 @@
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc'
 incs += ' ../../makesrna'
-incs += ' #/intern/audaspace/intern '
-incs += env['BF_PYTHON_INC']
+incs += ' #/intern/audaspace/intern'
+if env['WITH_BF_PYTHON']:
+    incs += ' ' + env['BF_PYTHON_INC']
 
 defs = []
 

Modified: trunk/blender/source/blender/editors/space_graph/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_graph/SConscript	2010-08-16 18:59:36 UTC (rev 31395)
+++ trunk/blender/source/blender/editors/space_graph/SConscript	2010-08-16 19:09:42 UTC (rev 31396)
@@ -5,7 +5,8 @@
 
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
-incs += ' #/intern/audaspace/intern '
-incs += env['BF_PYTHON_INC']
+incs += ' #/intern/audaspace/intern'
+if env['WITH_BF_PYTHON']:
+    incs += ' ' + env['BF_PYTHON_INC']
 
 env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] )

Modified: trunk/blender/source/blender/editors/space_sequencer/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/SConscript	2010-08-16 18:59:36 UTC (rev 31395)
+++ trunk/blender/source/blender/editors/space_sequencer/SConscript	2010-08-16 19:09:42 UTC (rev 31396)
@@ -6,7 +6,8 @@
 incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../makesrna'
-incs += ' #/intern/audaspace/intern '
-incs += env['BF_PYTHON_INC']
+incs += ' #/intern/audaspace/intern'
+if env['WITH_BF_PYTHON']:
+    incs += ' ' + env['BF_PYTHON_INC']
 
 env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] )

Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript	2010-08-16 18:59:36 UTC (rev 31395)
+++ trunk/blender/source/blender/makesdna/intern/SConscript	2010-08-16 19:09:42 UTC (rev 31396)
@@ -60,7 +60,7 @@
 	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")
+		dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
 else:
 	if USE_WINE:
 		dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET")

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2010-08-16 18:59:36 UTC (rev 31395)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2010-08-16 19:09:42 UTC (rev 31396)
@@ -33,7 +33,7 @@
 incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin'
 incs += ' ../../windowmanager ../../editors/include'
 incs += ' ../../render/extern/include'
-incs += ' #/intern/audaspace/intern'
+incs += ' #/intern/audaspace/intern '
 
 if env['WITH_BF_OPENEXR']:
 	defs.append('WITH_OPENEXR')
@@ -85,7 +85,9 @@
 if env['BF_UNIT_TEST']:
 	defs.append('UNIT_TEST')
 
-if not env['WITH_BF_PYTHON']:
+if env['WITH_BF_PYTHON']:
+	incs  += ' ' + env['BF_PYTHON_INC']
+else:
 	defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
@@ -152,7 +154,7 @@
 	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)
+		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)