diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-04-15 01:55:38 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-04-15 01:55:38 +0400 |
| commit | 48ed63b1a5cb7808df66aaeb16d7ea8cf36a7e34 (patch) | |
| tree | 0a7399e675d984c14205ab6f30435c46c1e34b57 | |
| parent | 44f10d889e52ed92b540ea9e447ab9a95ecc0ed0 (diff) | |
Scons ToDo:
* Made Smoke building optional, added WITH_BF_SMOKE.
* Enabled per default in btools.py
| -rw-r--r-- | build_files/scons/tools/btools.py | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/gpu/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/render/SConscript | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index bb1948b2c16..f822453367f 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -154,6 +154,7 @@ def validate_arguments(args, bc): '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 @@ def read_opts(env, cfg, args): (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', ''), diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 684c3d8683b..fe27e78abc0 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -23,7 +23,9 @@ incs += ' ' + env['BF_ZLIB_INC'] 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']: diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index ee4491c1c77..181af6bb1d4 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -13,6 +13,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): 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] ) diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 903306c36ff..db35764a31c 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -14,7 +14,8 @@ cxxflags_raytrace = env['CXXFLAGS'] 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' |