Gurkengewuerz/KShare
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix appveyor

Browse Source
This commit is contained in:
Niklas 2019-05-07 17:23:39 +02:00
parent 3a4ac315b1
commit da9061d4b9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AppVeyor/appveyor.yml
View File

@ -13,7 +13,7 @@ build_script:
- curl -kLO https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-3.3.2-win64-shared.zip - 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 - 7z x ffmpeg-3.3.2-win64-shared.zip
- set FFMPEG_SHARED_PATH=%cd%\ffmpeg-3.3.2-win64-shared - 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 - 7z x av.7z > NUL
- xcopy ffmpeg-3.3.2-win64-shared\* %QTDIR% /e /i /Y - xcopy ffmpeg-3.3.2-win64-shared\* %QTDIR% /e /i /Y
- xcopy ffmpeg-3.3.2-win64-dev\* %QTDIR% /e /i /Y - xcopy ffmpeg-3.3.2-win64-dev\* %QTDIR% /e /i /Y

5
AppVeyor/make_installer.sh
View File

@ -21,6 +21,8 @@ cd packages/windows
cp ../../KShare.exe . || exit 3 cp ../../KShare.exe . || exit 3
7z a -tzip portable.zip KShare.exe 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 sed "s/;VER;/$ver/" installer.iss.pattern.top > installer.iss
addFile ../../build/QtAV-depends-windows-x86+x64/bin/avcodec-57.dll 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/libeay32.dll
addFile /c/OpenSSL-Win32/bin/ssleay32.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 ----------------- echo -----------------
ls /c/OpenSSL-Win32/bin/ -R ls /c/OpenSSL-Win32/bin/ -R