Scons ToDo:
* Made Frameserver building optional, added WITH_BF_FRAMESERVER. * Enabled per default in btools.py
This commit is contained in:
parent
48ed63b1a5
commit
f725a3d6c4
@ -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',
|
||||
@ -313,6 +314,8 @@ def read_opts(env, cfg, args):
|
||||
(BoolVariable('WITH_BF_CINEON', 'Support CINEON and DPX image formats if true', True)),
|
||||
|
||||
(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', ''),
|
||||
|
@ -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'
|
||||
|
@ -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']
|
||||
|
@ -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')
|
||||
|
Loading…
Reference in New Issue
Block a user