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>2008-04-27 21:00:22 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2008-04-27 21:00:22 +0400
commit7e7118aebb86bce534cb751c97f169223748b034 (patch)
tree28bfc4fbac4651b9892fac1e3881b189a41714ae /SConstruct
parent2740bbc89ce5638872963dac5ea2810915b7f49d (diff)
* copy FFMPEG libraries on Windows to BF_INSTALLDIR when done.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct11
1 files changed, 7 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 47914b8853d..722082bd056 100644
--- a/SConstruct
+++ b/SConstruct
@@ -432,10 +432,13 @@ 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']
+ if env['WITH_BF_FFMPEG']:
+ dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+ '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaad-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+ '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
+ '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls