oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dependencies and path for linux/mac builds

Browse Source
This commit is contained in:
itsmattkc
2020-01-19 23:08:48 +11:00
parent cdb4de1513
commit d59c730f4f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/before_install.sh
+2 -2
View File
@@ -2,8 +2,8 @@
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
# Qt 5.10.1 (may have to source newer version at some point)
sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y
# Qt 5.11
sudo add-apt-repository ppa:beineri/opt-qt-5.11.0-xenial -y
# FFmpeg 4.x
sudo add-apt-repository ppa:jonathonf/ffmpeg-4 -y
.travis/install.sh
+2 -3
View File
@@ -2,12 +2,11 @@
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
#export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
echo Attempting skip of Mac path export
export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH"
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt510base qt510multimedia qt510svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
source /opt/qt*/bin/qt*-env.sh
fi