Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Scons:

Browse Source 
* WITH_BF_COMPOSITOR option, to disable tile compositor compilation.
* Removed unused SCons file.
This commit is contained in:
Thomas Dinges
2012-06-30 22:44:36 +00:00
parent 2932cded40
commit 273f56ace0
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build_files/scons/tools/btools.py
View File

@@ -108,6 +108,7 @@ def validate_arguments(args, bc):
'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC', 'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
'WITH_BF_FRAMESERVER', 'WITH_BF_FRAMESERVER',
'WITH_BF_COMPOSITOR',
'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH', 'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH', 'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -531,6 +532,8 @@ def read_opts(env, cfg, args):
(BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean operations', True)), (BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean operations', True)),
(BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)), (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
(BoolVariable('WITH_BF_COMPOSITOR', 'Enable the tile based nodal compositor', True)),
('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),

2
source/SConscript
View File

@@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
Import ('env') Import ('env')
SConscript(['blender/SConscript', 'creator/SConscript']) SConscript(['blender/SConscript'])
if env['WITH_BF_GAMEENGINE']: if env['WITH_BF_GAMEENGINE']:
SConscript (['gameengine/SConscript']) SConscript (['gameengine/SConscript'])

6
source/blender/SConscript
View File

@@ -8,11 +8,9 @@ SConscript(['avi/SConscript',
'blenlib/SConscript', 'blenlib/SConscript',
'blenloader/SConscript', 'blenloader/SConscript',
'gpu/SConscript', 'gpu/SConscript',
'opencl/SConscript',
'editors/SConscript', 'editors/SConscript',
'imbuf/SConscript', 'imbuf/SConscript',
'makesdna/SConscript', 'makesdna/SConscript',
'compositor/SConscript',
'render/SConscript', 'render/SConscript',
'nodes/SConscript', 'nodes/SConscript',
'modifiers/SConscript', 'modifiers/SConscript',
@@ -39,3 +37,7 @@ if env['WITH_BF_QUICKTIME']:
if env['WITH_BF_COLLADA']: if env['WITH_BF_COLLADA']:
SConscript (['collada/SConscript']) SConscript (['collada/SConscript'])
if env['WITH_BF_COMPOSITOR']:
SConscript (['compositor/SConscript',
'opencl/SConscript'])

7
source/blender/nodes/SConscript
View File

@@ -13,7 +13,6 @@ incs += ' ../imbuf ../avi '
incs += ' ../blenloader' incs += ' ../blenloader'
incs += ' ../blenfont ../blenkernel ../renderconverter ' incs += ' ../blenfont ../blenkernel ../renderconverter '
incs += ' ../gpu #/extern/glew/include ' incs += ' ../gpu #/extern/glew/include '
incs += ' ../compositor '
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_ZLIB_INC']
@@ -36,8 +35,10 @@ if env['OURPLATFORM'] == 'linux':
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC'] incs += ' ' + env['BF_PTHREADS_INC']
defs.append("WITH_COMPOSITOR") if env['WITH_BF_COMPOSITOR']:
incs += ' ../compositor '
defs.append("WITH_COMPOSITOR")
env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] ) env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] ) env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )

3
source/creator/SConscript
View File

@@ -1,3 +0,0 @@
#!/usr/bin/python
# dummy, code has been moved to Blender.creator()