[Bf-blender-cvs] [f194ab7] master: Compilation fix for SCons

Sergey Sharybin noreply at git.blender.org
Tue Jan 28 10:14:24 CET 2014


Commit: f194ab765996cb9830da2396f28f1ddad1778d0b
Author: Sergey Sharybin
Date:   Tue Jan 28 15:14:00 2014 +0600
https://developer.blender.org/rBf194ab765996cb9830da2396f28f1ddad1778d0b

Compilation fix for SCons

Was broken by recent FFmpeg changes.

===================================================================

M	source/blender/makesrna/SConscript

===================================================================

diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index d74cf20..7abda87 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -92,7 +92,7 @@ if env['WITH_BF_FRAMESERVER']:
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
-    incs += ' ' + env['BF_FFMPEG_INC']
+    incs += ' ' + env['BF_FFMPEG_INC'] + ' #/intern/ffmpeg'
 
 if env['WITH_BF_QUICKTIME']:
     defs.append('WITH_QUICKTIME')




More information about the Bf-blender-cvs mailing list