updated mac travis script

This commit is contained in:
itsmattkc
2019-09-11 02:24:21 +10:00
parent 0f5877e1a3
commit 5fbd90d9f5
3 changed files with 13 additions and 12 deletions
+2 -2
View File
@@ -9,11 +9,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
make -j$(sysctl -n hw.ncpu)
# Move Qt deps into bundle
macdeployqt Olive.app
macdeployqt app/Olive.app
# Fix other deps that macdeployqt missed
wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py
python2 macdeployqtfix.py Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
python2 macdeployqtfix.py app/Olive.app/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/
# Distribute in zip
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip app/Olive.app
+5 -4
View File
@@ -5,12 +5,13 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_
REM Install FFmpeg
curl -L -o ffmpeg-shared.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-shared.zip
curl -L -o ffmpeg-dev.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-dev.zip
7z e ffmpeg-shared.zip
7z e ffmpeg-dev.zip
7z x ffmpeg-shared.zip
7z x ffmpeg-dev.zip
REM Install OpenColorIO
curl -L -o ocio.zip https://github.com/olive-editor/OpenColorIO-Win32/releases/download/v1.1.1/ocio-v1.1.1-win64-shared.zip
7z e ocio.zip
curl -L -o ocio-v1.1.1-win64-shared.zip https://github.com/olive-editor/OpenColorIO-Win32/releases/download/v1.1.1/ocio-v1.1.1-win64-shared.zip
7z x ocio-v1.1.1-win64-shared.zip
set OPENCOLORIO_ROOT_DIR=ocio-v1.1.1-win64-shared
REM Install OpenImageIO
REM vcpkg install openimageio
+6 -6
View File
@@ -5,12 +5,12 @@ branches:
image: Visual Studio 2015
environment:
TRAVIS_REPO_SLUG: olive-editor/olive
matrix:
- MSYSTEM: MINGW64
QTDIR: 5.12\mingw73_64
ARCH: x86_64
QTTOOLS: Tools\mingw730_64
NSISDEF: /DX64
# matrix:
# - MSYSTEM: MINGW64
# QTDIR: 5.12\mingw73_64
# ARCH: x86_64
# QTTOOLS: Tools\mingw730_64
# NSISDEF: /DX64
# - MSYSTEM: MINGW32
# QTDIR: 5.12\mingw73_32
# ARCH: i686