diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-24 06:51:59 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-08-24 06:51:59 +0400 |
| commit | 365783cad4e4b6c2e7d554e71d3ebac4b3d1922c (patch) | |
| tree | 83dbf5b55dfc886e98bdc29b7f62d353af107016 /SConstruct | |
| parent | ac44d73acdb5297d3e0a177b00a03ef8cca5e696 (diff) | |
| parent | 5e9e6df2a24b28cbb8c1de293725ebe4af3f9a2d (diff) | |
* merge r22734 from trunk
NOTE: Remember to svn up your lib/windows. Also, CMake files might need updating still
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'] |