[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48459] trunk/blender: Scons:
Thomas Dinges
blender at dingto.org
Sun Jul 1 00:44:46 CEST 2012
Revision: 48459
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48459
Author: dingto
Date: 2012-06-30 22:44:36 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Scons:
* WITH_BF_COMPOSITOR option, to disable tile compositor compilation.
* Removed unused SCons file.
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/source/SConscript
trunk/blender/source/blender/SConscript
trunk/blender/source/blender/nodes/SConscript
Removed Paths:
-------------
trunk/blender/source/creator/SConscript
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2012-06-30 21:19:12 UTC (rev 48458)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-06-30 22:44:36 UTC (rev 48459)
@@ -108,6 +108,7 @@
'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
'WITH_BF_FRAMESERVER',
+ 'WITH_BF_COMPOSITOR',
'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',
@@ -531,6 +532,8 @@
(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_COMPOSITOR', 'Enable the tile based nodal compositor', True)),
('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
Modified: trunk/blender/source/SConscript
===================================================================
--- trunk/blender/source/SConscript 2012-06-30 21:19:12 UTC (rev 48458)
+++ trunk/blender/source/SConscript 2012-06-30 22:44:36 UTC (rev 48459)
@@ -1,7 +1,7 @@
#!/usr/bin/python
Import ('env')
-SConscript(['blender/SConscript', 'creator/SConscript'])
+SConscript(['blender/SConscript'])
if env['WITH_BF_GAMEENGINE']:
SConscript (['gameengine/SConscript'])
Modified: trunk/blender/source/blender/SConscript
===================================================================
--- trunk/blender/source/blender/SConscript 2012-06-30 21:19:12 UTC (rev 48458)
+++ trunk/blender/source/blender/SConscript 2012-06-30 22:44:36 UTC (rev 48459)
@@ -8,11 +8,9 @@
'blenlib/SConscript',
'blenloader/SConscript',
'gpu/SConscript',
- 'opencl/SConscript',
'editors/SConscript',
'imbuf/SConscript',
'makesdna/SConscript',
- 'compositor/SConscript',
'render/SConscript',
'nodes/SConscript',
'modifiers/SConscript',
@@ -39,3 +37,7 @@
if env['WITH_BF_COLLADA']:
SConscript (['collada/SConscript'])
+
+if env['WITH_BF_COMPOSITOR']:
+ SConscript (['compositor/SConscript',
+ 'opencl/SConscript'])
Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript 2012-06-30 21:19:12 UTC (rev 48458)
+++ trunk/blender/source/blender/nodes/SConscript 2012-06-30 22:44:36 UTC (rev 48459)
@@ -13,7 +13,6 @@
incs += ' ../blenloader'
incs += ' ../blenfont ../blenkernel ../renderconverter '
incs += ' ../gpu #/extern/glew/include '
-incs += ' ../compositor '
incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC']
@@ -36,9 +35,11 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']
+
+if env['WITH_BF_COMPOSITOR']:
+ incs += ' ../compositor '
+ defs.append("WITH_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_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
Deleted: trunk/blender/source/creator/SConscript
===================================================================
--- trunk/blender/source/creator/SConscript 2012-06-30 21:19:12 UTC (rev 48458)
+++ trunk/blender/source/creator/SConscript 2012-06-30 22:44:36 UTC (rev 48459)
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-
-# dummy, code has been moved to Blender.creator()
More information about the Bf-blender-cvs
mailing list