diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 09:11:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 09:11:04 +0400 |
| commit | 08d6932c860e7f2926e3980764fc5e11a821d0a3 (patch) | |
| tree | 0d88c8f33701ce024f5c64317d05a5116dbc19ba /source/blender/blenkernel/SConscript | |
| parent | 38293a00c379bdeb224a73279ee08850d86f308c (diff) | |
| parent | dcd55cef86270f076cf827c5ae7a6cc76db4f9ad (diff) | |
svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/SConscript')
| -rw-r--r-- | source/blender/blenkernel/SConscript | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 70641b340b2..3f92dde9a49 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -15,6 +15,7 @@ incs += ' ../bmesh' incs += ' #/intern/smoke/extern' incs += ' #/intern/mikktspace' incs += ' #/intern/audaspace/intern' +incs += ' #/intern/ffmpeg' incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_ZLIB_INC'] |