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:
authorNathan Letwory <nathan@letworyinteractive.com>2006-11-20 14:15:35 +0300
committerNathan Letwory <nathan@letworyinteractive.com>2006-11-20 14:15:35 +0300
commitaf0d38d6eff1f165e88bc753b8b9c99b9f5a9fc9 (patch)
treee765337897b43066344585beb3de0d71692f67a0 /SConstruct
parent19a4f411723a08cded485cf694bbbab4a3dba31c (diff)
Patch [ #5254 ] FFMpeg for scons for MSVC
from Guillaume Lecocq I also added -D_CRT_SECURE_NO_DEPRECATE to shut the newer msvc version about deprecated functions (sprintf et al).
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct15
1 files changed, 15 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct
index b5fb4d7d4ac..cc10be55f2b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -370,6 +370,21 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
if env['WITH_BF_ICONV']:
dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
+ if env['WITH_BF_FFMPEG']:
+ dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+ '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
+ '${LCGDIR}/ffmpeg/lib/avutil-49.dll',
+ '${LCGDIR}/ffmpeg/lib/libdts.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaac.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaad.dll',
+ '${LCGDIR}/ffmpeg/lib/libgsm.dll',
+ '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libogg-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libvorbis-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libvorbisenc-2.dll',
+ '${LCGDIR}/ffmpeg/lib/libx264-54.dll',
+ '${LCGDIR}/ffmpeg/lib/postproc-51.dll',
+ '${LCGDIR}/ffmpeg/lib/xvidcore.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls