diff --git a/AppVeyor/appveyor.yml b/AppVeyor/appveyor.yml index 9440eeb..dd4278b 100644 --- a/AppVeyor/appveyor.yml +++ b/AppVeyor/appveyor.yml @@ -13,7 +13,7 @@ build_script: - curl -kLO https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-3.3.2-win64-shared.zip - 7z x ffmpeg-3.3.2-win64-shared.zip - set FFMPEG_SHARED_PATH=%cd%\ffmpeg-3.3.2-win64-shared - - curl -L https://downloads.sourceforge.net/project/qtav/depends/QtAV-depends-windows-x86%2Bx64.7z -o av.7z + - curl -v -L --http1.1 --tlsv1.2 "https://downloads.sourceforge.net/project/qtav/depends/QtAV-depends-windows-x86+x64.7z" -o av.7z - 7z x av.7z > NUL - xcopy ffmpeg-3.3.2-win64-shared\* %QTDIR% /e /i /Y - xcopy ffmpeg-3.3.2-win64-dev\* %QTDIR% /e /i /Y diff --git a/AppVeyor/make_installer.sh b/AppVeyor/make_installer.sh index 620d465..77e80de 100644 --- a/AppVeyor/make_installer.sh +++ b/AppVeyor/make_installer.sh @@ -21,6 +21,8 @@ cd packages/windows cp ../../KShare.exe . || exit 3 7z a -tzip portable.zip KShare.exe +cp /c/Windows/System32/msvcr120.dll /c/projects/kshare/packages/windows/ + sed "s/;VER;/$ver/" installer.iss.pattern.top > installer.iss addFile ../../build/QtAV-depends-windows-x86+x64/bin/avcodec-57.dll @@ -42,7 +44,8 @@ addFile /c/Qt/5.9/mingw53_32/bin/LIBGCC_S_DW2-1.DLL addFile /c/OpenSSL-Win32/bin/libeay32.dll addFile /c/OpenSSL-Win32/bin/ssleay32.dll -addFile /c/OpenSSL-Win32/bin/msvcr120.dll +#addFile /c/OpenSSL-Win32/bin/msvcr120.dll +addFile /c/Windows/System32/msvcr120.dll echo ----------------- ls /c/OpenSSL-Win32/bin/ -R