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 /source/blender | |
| parent | 44f10d889e52ed92b540ea9e447ab9a95ecc0ed0 (diff) | |
Scons ToDo:
* Made Smoke building optional, added WITH_BF_SMOKE.
* Enabled per default in btools.py
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/gpu/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/render/SConscript | 3 |
3 files changed, 7 insertions, 3 deletions
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' |