diff options
-rw-r--r-- | CMakeLists.txt | 12 | ||||
-rw-r--r-- | build_files/buildbot/slave_compile.py | 26 | ||||
-rw-r--r-- | build_files/buildbot/slave_pack.py | 26 | ||||
-rw-r--r-- | build_files/scons/config/linuxcross-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 2 | ||||
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 4 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 4 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 10 |
8 files changed, 23 insertions, 63 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ccd101dd46d..4a544cbfa05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -710,11 +710,11 @@ elseif(WIN32) ${LIBDIR}/ffmpeg/include/msvc ) set(FFMPEG_LIBRARIES - ${LIBDIR}/ffmpeg/lib/avcodec-52.lib - ${LIBDIR}/ffmpeg/lib/avformat-52.lib - ${LIBDIR}/ffmpeg/lib/avdevice-52.lib - ${LIBDIR}/ffmpeg/lib/avutil-50.lib - ${LIBDIR}/ffmpeg/lib/swscale-0.lib + ${LIBDIR}/ffmpeg/lib/avcodec-53.lib + ${LIBDIR}/ffmpeg/lib/avformat-53.lib + ${LIBDIR}/ffmpeg/lib/avdevice-53.lib + ${LIBDIR}/ffmpeg/lib/avutil-51.lib + ${LIBDIR}/ffmpeg/lib/swscale-2.lib ) endif() @@ -841,7 +841,7 @@ elseif(WIN32) if(WITH_CODEC_FFMPEG) set(FFMPEG ${LIBDIR}/ffmpeg) set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include) - set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0) + set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2) set(FFMPEG_LIBPATH ${FFMPEG}/lib) endif() diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index b83a65f2466..415f95a516f 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -108,31 +108,11 @@ else: sys.exit(0) else: - bitness = '32' - # 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' - bitness = '64' - - all_ffmpeg_libs = ['avcodec-53', - 'avdevice-53', - 'avformat-53', - 'avutil-51', - 'swscale-2'] - - ffmpeg_lib = [] - ffmpeg_dll = [] + bitness = '32' - for lib in all_ffmpeg_libs: - ffmpeg_lib.append(lib + '.lib') - ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll') - - 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))) + if builder.find('win64') != -1: + bitness = '64' scons_options.append('BF_BITNESS=' + bitness) diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 5fdeb4a8ad5..af8d99893b4 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -72,31 +72,11 @@ if builder.find('scons') != -1: retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options) sys.exit(retcode) else: - bitness = '32' - # 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' - bitness = '64' - - all_ffmpeg_libs = ['avcodec-53', - 'avdevice-53', - 'avformat-53', - 'avutil-51', - 'swscale-2'] - - ffmpeg_lib = [] - ffmpeg_dll = [] + bitness = '32' - for lib in all_ffmpeg_libs: - ffmpeg_lib.append(lib + '.lib') - ffmpeg_dll.append('${BF_FFMPEG_LIBPATH}/' + lib + '.dll') - - 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))) + if builder.find('win64') != -1: + bitness = '64' scons_options.append('BF_BITNESS=' + bitness) diff --git a/build_files/scons/config/linuxcross-config.py b/build_files/scons/config/linuxcross-config.py index 62474527825..563b1ad980c 100644 --- a/build_files/scons/config/linuxcross-config.py +++ b/build_files/scons/config/linuxcross-config.py @@ -126,7 +126,7 @@ WITH_BF_BINRELOC = False # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR + '/ffmpeg' -BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0' +BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib' diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index 6dac29b37f7..b29c4845a9c 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -18,7 +18,7 @@ BF_OPENAL_LIB = 'wrap_oal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' WITH_BF_FFMPEG = False -BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0' +BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2' BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/ffmpeg/include' diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 4baada7f9bf..2f8fa297667 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -6,8 +6,8 @@ WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib' -BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll ${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll ${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll' +BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib' +BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll' BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '3.2' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index db7c8d09af8..ba9633a6b4c 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -6,8 +6,8 @@ WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc ' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib' -BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-52.dll ${BF_FFMPEG_LIBPATH}/avcodec-52.dll ${BF_FFMPEG_LIBPATH}/avdevice-52.dll ${BF_FFMPEG_LIBPATH}/avutil-50.dll ${BF_FFMPEG_LIBPATH}/swscale-0.dll' +BF_FFMPEG_LIB = 'avformat-53.lib avcodec-53.lib avdevice-53.lib avutil-51.lib swscale-2.lib' +BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll' BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '3.2' diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c4a5222a719..315cd5312cf 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -545,11 +545,11 @@ elseif(WIN32) if(WITH_CODEC_FFMPEG) install( FILES - ${LIBDIR}/ffmpeg/lib/avcodec-52.dll - ${LIBDIR}/ffmpeg/lib/avformat-52.dll - ${LIBDIR}/ffmpeg/lib/avdevice-52.dll - ${LIBDIR}/ffmpeg/lib/avutil-50.dll - ${LIBDIR}/ffmpeg/lib/swscale-0.dll + ${LIBDIR}/ffmpeg/lib/avcodec-53.dll + ${LIBDIR}/ffmpeg/lib/avformat-53.dll + ${LIBDIR}/ffmpeg/lib/avdevice-53.dll + ${LIBDIR}/ffmpeg/lib/avutil-51.dll + ${LIBDIR}/ffmpeg/lib/swscale-2.dll DESTINATION ${TARGETDIR} ) |