[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45639] trunk/blender: Scons ToDo:

[Thomas Dinges]

Revision: 45639
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45639
Author:   dingto
Date:     2012-04-14 21:55:38 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Scons ToDo:
* Made Smoke building optional, added WITH_BF_SMOKE.
* 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/gpu/SConscript
    trunk/blender/source/blender/render/SConscript

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2012-04-14 21:48:34 UTC (rev 45638)
+++ trunk/blender/build_files/scons/tools/btools.py	2012-04-14 21:55:38 UTC (rev 45639)
@@ -154,6 +154,7 @@
             'WITH_BF_BOOLEAN',
             'WITH_BF_REMESH',
             'WITH_BF_OCEANSIM',
+            'WITH_BF_SMOKE',
             'WITH_BF_CXX_GUARDEDALLOC',
             'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
             'BUILDBOT_BRANCH',
@@ -264,6 +265,7 @@
         (BoolVariable('WITH_BF_BOOLEAN', 'Build with boolean modifier', True)),
         (BoolVariable('WITH_BF_REMESH', 'Build with remesh modifier', True)),
         (BoolVariable('WITH_BF_OCEANSIM', 'Build with ocean simulation', False)),
+        (BoolVariable('WITH_BF_SMOKE', 'Build with smoke simulation', True)),
         ('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
         (BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
         ('BF_OPENAL', 'Base path for OpenAL', ''),

Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript	2012-04-14 21:48:34 UTC (rev 45638)
+++ trunk/blender/source/blender/blenkernel/SConscript	2012-04-14 21:55:38 UTC (rev 45639)
@@ -23,7 +23,9 @@
 
 defs = [ 'GLEW_STATIC' ]
 
-defs.append('WITH_SMOKE')  # TODO, make optional
+if env['WITH_BF_SMOKE']:
+    defs.append('WITH_SMOKE')
+
 defs.append('WITH_FRAMESERVER')  # TODO, make optional
 
 if env['WITH_BF_PYTHON']:

Modified: trunk/blender/source/blender/gpu/SConscript
===================================================================
--- trunk/blender/source/blender/gpu/SConscript	2012-04-14 21:48:34 UTC (rev 45638)
+++ trunk/blender/source/blender/gpu/SConscript	2012-04-14 21:55:38 UTC (rev 45639)
@@ -13,6 +13,7 @@
 
 incs += ' ' + env['BF_OPENGL_INC']
 
-defs.append('WITH_SMOKE')  # TODO, make optional
+if env['WITH_BF_SMOKE']:
+    defs.append('WITH_SMOKE')
 
 env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] )

Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript	2012-04-14 21:48:34 UTC (rev 45638)
+++ trunk/blender/source/blender/render/SConscript	2012-04-14 21:55:38 UTC (rev 45639)
@@ -14,7 +14,8 @@
 defs = []
 defs_raytrace = []
 
-defs.append('WITH_SMOKE')  # TODO, make optional
+if env['WITH_BF_SMOKE']:
+    defs.append('WITH_SMOKE')
 
 if env['WITH_BF_PYTHON']:
     incs += ' ../python'