From df6dfb93b2a8194b3e96167e1b5eba54b07882c9 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 3 Aug 2011 11:10:19 +0000 Subject: Switch windows buildbot to new FFmpeg 0.8.1. Hope it'll work because i haven't got buildbot slave by hand. --- build_files/buildbot/slave_compile.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'build_files/buildbot/slave_compile.py') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index e74d889c243..5aa39db68f9 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -108,5 +108,29 @@ else: sys.exit(0) else: + # Switch to new FFmpeg library + if builder.find('win') != -1: + if builder.find('win32') != -1: + LCGDIR = '#../lib/windows' + elif builder.find('win64') != -1: + LCGDIR = '#../lib/win64' + + all_ffmpeg_libs = ['avcodec-53', + 'avdevice-53', + 'avformat-53', + 'avutil-51', + 'swscale-2'] + + ffmpeg_lib = [] + ffmpeg_dll = [] + + for lib in all_ffmpeg_libs: + ffmpeg_lib.append(lib + '.lib') + ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.lib') + + scons_options.append('BF_FFMPEG=' + LCGDIR + '/ffmpeg-0.8') + scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib))) + scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll))) + retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) -- cgit v1.2.3