[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45640] trunk/blender: Scons ToDo:
Thomas Dinges
blender at dingto.org
Sun Apr 15 00:19:30 CEST 2012
Revision: 45640
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45640
Author: dingto
Date: 2012-04-14 22:19:29 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Scons ToDo:
* Made Frameserver building optional, added WITH_BF_FRAMESERVER.
* Enabled per default in btools.py
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2012-04-14 21:55:38 UTC (rev 45639)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-04-14 22:19:29 UTC (rev 45640)
@@ -107,6 +107,7 @@
'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 @@
(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', ''),
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2012-04-14 21:55:38 UTC (rev 45639)
+++ trunk/blender/source/blender/blenkernel/SConscript 2012-04-14 22:19:29 UTC (rev 45640)
@@ -26,7 +26,8 @@
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'
Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript 2012-04-14 21:55:38 UTC (rev 45639)
+++ trunk/blender/source/blender/makesrna/SConscript 2012-04-14 22:19:29 UTC (rev 45640)
@@ -35,6 +35,9 @@
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']
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2012-04-14 21:55:38 UTC (rev 45639)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2012-04-14 22:19:29 UTC (rev 45640)
@@ -54,7 +54,8 @@
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')
More information about the Bf-blender-cvs
mailing list