diff options
| author | Matt Ebb <matt@mke3.net> | 2009-08-25 05:37:08 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-08-25 05:37:08 +0400 |
| commit | ea97a373834ea956ad0778b2c535452a6ecb1752 (patch) | |
| tree | 9da83b01797e1697bc6f99e999bee927e072b3e0 /SConstruct | |
| parent | 90895fce8ca4f40bd41026b0406d80e8e83e0e8d (diff) | |
| parent | 4a78b9e9046567e86ed3ccada83a50c43684facd (diff) | |
svn merge -r 22628:22753 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blendervolume25
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index dad9ef54446..f2eb7146930 100644 --- a/SConstruct +++ b/SConstruct @@ -580,11 +580,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'): '${LCGDIR}/ffmpeg/lib/avformat-52.dll', '${LCGDIR}/ffmpeg/lib/avdevice-52.dll', '${LCGDIR}/ffmpeg/lib/avutil-50.dll', - '${LCGDIR}/ffmpeg/lib/libfaad-2.dll', - '${LCGDIR}/ffmpeg/lib/libfaac-0.dll', - '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', - '${LCGDIR}/ffmpeg/lib/libx264-67.dll', - '${LCGDIR}/ffmpeg/lib/xvidcore.dll', +# '${LCGDIR}/ffmpeg/lib/libfaad-2.dll', +# '${LCGDIR}/ffmpeg/lib/libfaac-0.dll', +# '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', +# '${LCGDIR}/ffmpeg/lib/libx264-67.dll', +# '${LCGDIR}/ffmpeg/lib/xvidcore.dll', '${LCGDIR}/ffmpeg/lib/swscale-0.dll'] if env['WITH_BF_JACK']: dllsources += ['${LCGDIR}/jack/lib/libjack.dll'] |