From b3dcd7af5a9b896de10fef26e7cbe04628d06de9 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 11 Sep 2019 22:50:35 +1000 Subject: [PATCH] build tweaks --- .travis/install.sh | 2 +- .travis/script.sh | 2 +- appveyor-build.bat | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis/install.sh b/.travis/install.sh index 3993de05a..f1f52260c 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -7,7 +7,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo apt-get -y install qt510base qt510multimedia qt510svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev + sudo apt-get -y install qt510base qt510multimedia qt510svg 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 diff --git a/.travis/script.sh b/.travis/script.sh index 3c600b41b..abfcce502 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -23,7 +23,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then # Generate Makefile - cmake . + cmake . -DQt5LinguistTools_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5LinguistTools # Make make -j$(nproc) diff --git a/appveyor-build.bat b/appveyor-build.bat index bdce3e54b..ed39d39e6 100644 --- a/appveyor-build.bat +++ b/appveyor-build.bat @@ -22,10 +22,7 @@ cmake . -G "NMake Makefiles" -DOPENCOLORIO_ROOT_DIR=ocio-v1.1.1-win64-shared -DF REM Build Olive nmake -REM For temporary testing, open remote connection -powershell $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - -REM Dependencies are installed, time to set up packages +REM Build finished, time to package mkdir olive copy app\olive-editor.exe olive cd olive