diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
commit | cdbfd1db3800cf4f0ea691f09bf05e78a82c80f9 (patch) | |
tree | b1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1 /source/blender/blenkernel/SConscript | |
parent | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (diff) | |
parent | 15eb3452ecd96e4d79d438e8c954918639dc283d (diff) |
Merged changes in the trunk up to revision 45820.
Conflicts resolved:
source/creator/creator.c
Diffstat (limited to 'source/blender/blenkernel/SConscript')
-rw-r--r-- | source/blender/blenkernel/SConscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 3e4e0cc5646..e5ce210d862 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -23,8 +23,11 @@ incs += ' ' + env['BF_ZLIB_INC'] defs = [ 'GLEW_STATIC' ] -defs.append('WITH_SMOKE') # TODO, make optional -defs.append('WITH_FRAMESERVER') # TODO, make optional +if env['WITH_BF_SMOKE']: + defs.append('WITH_SMOKE') + +if env['WITH_BF_FRAMESERVER']: + defs.append('WITH_FRAMESERVER') if env['WITH_BF_PYTHON']: incs += ' ../python' |