From 4821abc8afb387b34d361d6dacc006ec1d33ebda Mon Sep 17 00:00:00 2001 From: Roman Proskuryakov Date: Tue, 10 May 2016 00:29:00 +0300 Subject: [PATCH] Fixes MSVC CI for FFmpeg --- CI/before_script.msvc.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 5aa8d3e9d..b2db84bd9 100755 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -405,22 +405,7 @@ printf "FFmpeg 2.5.2... " rm -rf ffmpeg-2.5.2-win$BITS-dev fi - FFMPEG_SDK="`real_pwd`/FFmpeg" - add_cmake_opts -DAVCODEC_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DAVCODEC_LIBRARIES="$FFMPEG_SDK/lib/avcodec.lib" \ - -DAVDEVICE_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DAVDEVICE_LIBRARIES="$FFMPEG_SDK/lib/avdevice.lib" \ - -DAVFORMAT_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DAVFORMAT_LIBRARIES="$FFMPEG_SDK/lib/avformat.lib" \ - -DAVUTIL_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DAVUTIL_LIBRARIES="$FFMPEG_SDK/lib/avutil.lib" \ - -DPOSTPROC_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DPOSTPROC_LIBRARIES="$FFMPEG_SDK/lib/postproc.lib" \ - -DSWRESAMPLE_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DSWRESAMPLE_LIBRARIES="$FFMPEG_SDK/lib/swresample.lib" \ - -DSWSCALE_INCLUDE_DIRS="$FFMPEG_SDK/include" \ - -DSWSCALE_LIBRARIES="$FFMPEG_SDK/lib/swscale.lib" - + export FFMPEG_SDK="`real_pwd`/FFmpeg" add_runtime_dlls `pwd`/FFmpeg/bin/{avcodec-56,avformat-56,avutil-54,swresample-1,swscale-3}.dll if [ $BITS -eq 32 ]; then