bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Scons:

Browse Source 
* Should now build again without problems
* Fixed scons having problems to execute makes(d/r)na if build path contains spaces
This commit is contained in:
Joerg Mueller 2010-08-16 19:09:42 +00:00
parent 9bb21deec6
commit 1964b2329e
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sound/SConscript
View File

@ -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 = []

5
source/blender/editors/space_graph/SConscript
View File

@ -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] )

5
source/blender/editors/space_sequencer/SConscript
View File

@ -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] )

2
source/blender/makesdna/intern/SConscript
View File

@ -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")

8
source/blender/makesrna/intern/SConscript
View File

@ -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)