build tweaks
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
+1
-4
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user