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:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-08-03 15:10:19 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-08-03 15:10:19 +0400
commitdf6dfb93b2a8194b3e96167e1b5eba54b07882c9 (patch)
treeac2c4d3422c330e6291abb8f79d1030fcaf90f8c /build_files/buildbot
parent2c4357c1e10df65089459e048c44ff9c99b8ffd9 (diff)
Switch windows buildbot to new FFmpeg 0.8.1.
Hope it'll work because i haven't got buildbot slave by hand.
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/slave_compile.py24
1 files changed, 24 insertions, 0 deletions
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)