diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 23:09:42 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 23:09:42 +0400 |
| commit | 1964b2329e1ce5764ddcd2015e143d58d66bed7f (patch) | |
| tree | 27425ffed395fa1e036c3cacda421e11f563ffb9 /source/blender | |
| parent | 9bb21deec624c7005f475ca7d2fa7c2e3ebf1184 (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')
| -rw-r--r-- | source/blender/editors/sound/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_graph/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 8 |
5 files changed, 15 insertions, 10 deletions
diff --git a/source/blender/editors/sound/SConscript b/source/blender/editors/sound/SConscript index 5468d4313ae..a0a8fbf36d0 100644 --- a/source/blender/editors/sound/SConscript +++ b/source/blender/editors/sound/SConscript @@ -6,8 +6,9 @@ sources = env.Glob('*.c') 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 = [] diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript index 69e01740c05..438a70f4ba5 100644 --- a/source/blender/editors/space_graph/SConscript +++ b/source/blender/editors/space_graph/SConscript @@ -5,7 +5,8 @@ sources = env.Glob('*.c') 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] ) diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 2ea24198d93..7731743aaab 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -6,7 +6,8 @@ sources = env.Glob('*.c') 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] ) diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 38819ccdf96..116a9c40973 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -60,7 +60,7 @@ if env['OURPLATFORM'] != 'linuxcross': 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") 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) |