Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-08-16 23:09:42 +0400
committerJoerg Mueller <nexyon@gmail.com>2010-08-16 23:09:42 +0400
commit1964b2329e1ce5764ddcd2015e143d58d66bed7f (patch)
tree27425ffed395fa1e036c3cacda421e11f563ffb9 /source/blender/makesrna/intern/SConscript
parent9bb21deec624c7005f475ca7d2fa7c2e3ebf1184 (diff)
Scons:
* Should now build again without problems * Fixed scons having problems to execute makes(d/r)na if build path contains spaces
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
-rw-r--r--source/blender/makesrna/intern/SConscript8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 3bebffaddec..d1a7eeb82e6 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -33,7 +33,7 @@ incs = '#/intern/guardedalloc ../../blenlib ../../blenkernel'
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['WITH_BF_JACK']:
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'] != 'linuxcross':
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)