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

Scons ToDo:

Browse Source 
* Made Frameserver building optional, added WITH_BF_FRAMESERVER.
* Enabled per default in btools.py
This commit is contained in:
Thomas Dinges 2012-04-14 22:19:29 +00:00
parent 48ed63b1a5
commit f725a3d6c4
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,6 +107,7 @@ def validate_arguments(args, bc):
'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'BF_FFMPEG_DLL',
'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
'WITH_BF_FRAMESERVER',
'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_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@ -314,6 +315,8 @@ def read_opts(env, cfg, args):
(BoolVariable('WITH_BF_HDR', 'Support HDR image formats if true', True)),
(BoolVariable('WITH_BF_FRAMESERVER', 'Support export to a frameserver', True)),
(BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)),
('BF_FFMPEG', 'FFMPEG base path', ''),
('BF_FFMPEG_LIB', 'FFMPEG library', ''),

3
source/blender/blenkernel/SConscript
View File

@ -26,7 +26,8 @@ defs = [ 'GLEW_STATIC' ]
if env['WITH_BF_SMOKE']:
defs.append('WITH_SMOKE')
defs.append('WITH_FRAMESERVER') # TODO, make optional
if env['WITH_BF_FRAMESERVER']:
defs.append('WITH_FRAMESERVER')
if env['WITH_BF_PYTHON']:
incs += ' ../python'

3
source/blender/makesrna/SConscript
View File

@ -35,6 +35,9 @@ if env['WITH_BF_CINEON']:
if env['WITH_BF_HDR']:
defs.append('WITH_HDR')
if env['WITH_BF_FRAMESERVER']:
defs.append('WITH_FRAMESERVER')
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']

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

@ -54,7 +54,8 @@ if env['WITH_BF_CINEON']:
if env['WITH_BF_HDR']:
defs.append('WITH_HDR')
defs.append('WITH_FRAMESERVER') # TODO, make optional
if env['WITH_BF_FRAMESERVER']:
defs.append('WITH_FRAMESERVER')
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')