Merging r38562 through r38614 from trunkinto soc-2011-tomato

2011-07-22 16:58:22 +00:00
parent 478e42970c ffc490cbf1
commit 22e08353e2
23 changed files with 349 additions and 51 deletions
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -22,6 +22,7 @@ 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_PYTHON']:
    incs += ' ../python'