Switch windows buildbot to new FFmpeg 0.8.1.
Hope it'll work because i haven't got buildbot slave by hand.
This commit is contained in:
parent
2c4357c1e1
commit
df6dfb93b2
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue