diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
| commit | ce03ec4b866a3e1a6f19a266bf2c38c2c4b4afd0 (patch) | |
| tree | c25f25286bde21fa170dc4a8582a12c19388f4e7 /source/blender/blenkernel/SConscript | |
| parent | 4c3140004aa61169061ddd2628a4f2c8d88f46a1 (diff) | |
| parent | 76e91d7a5f8c253543bd1c938c8e74872d7a6c81 (diff) | |
Merged changes in the trunk up to revision 38543.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 96b07eb5e9a..2543194080e 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -21,6 +21,8 @@ incs += ' ' + env['BF_ZLIB_INC'] defs = [ 'GLEW_STATIC' ] +defs.append('WITH_SMOKE') # TODO, make optional + if env['WITH_BF_PYTHON']: incs += ' ../python' incs += ' ' + env['BF_PYTHON_INC'] |