Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-07-26 08:17:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-26 08:17:15 +0400
commit6d5080783e48a6767415ef0538e0a272fefee759 (patch)
tree316c26cc9138dd34831a3e2f56580d1f3d3b4dce /source/blender/makesrna/intern/SConscript
parentfc95382a977163a1d499c732960e7501cc065833 (diff)
parent0e933d089df3a17327caf8700c19df9f419a2973 (diff)
svn merge -r38500:38600 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesrna/intern/SConscript')
-rw-r--r--source/blender/makesrna/intern/SConscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 2adb8a4c2d1..c12310438b6 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -54,6 +54,8 @@ if env['WITH_BF_CINEON']:
if env['WITH_BF_HDR']:
defs.append('WITH_HDR')
+defs.append('WITH_FRAMESERVER') # TODO, make optional
+
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']