citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

travis: Use Qt 5 on Ubuntu CI builds

This commit is contained in:
Lioncash 2016-06-17 09:03:30 -04:00
parent 251457b9d5
commit c283a8509d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis-build.sh
View File

@ -16,7 +16,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
mkdir build && cd build mkdir build && cd build
cmake -DCITRA_FORCE_QT4=ON .. cmake ..
make -j4 make -j4
ctest -VV -C Release ctest -VV -C Release

16
.travis.yml
View File

@ -1,15 +1,17 @@
os:
- linux
- osx
language: cpp language: cpp
matrix:
include:
- os: linux
sudo: true
dist: trusty
- os: osx
sudo: false
env: env:
global: global:
- secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg=" - secure: "AXHFIafTmbGDsHD3mUVj5a4I397DQjti/WoqAJGUp2PglxTcc04BwxZ9Z+xLuf5N2Hs5r9ojAJLT8OGxJCLBDXzneQTNSqXbFuYSLbqrEAiIRlA9eRIotWCg+wYcO+5e8MKX+cHVKwiIWasUB21AtCdq6msh6Y3pUshZp212VPg="
sudo: false
addons: addons:
apt: apt:
sources: sources:
@ -17,6 +19,8 @@ addons:
packages: packages:
- gcc-5 - gcc-5
- g++-5 - g++-5
- qt5-default
- libqt5opengl5-dev
- xorg-dev - xorg-dev
- lib32stdc++6 # For CMake - lib32stdc++6 # For CMake
- lftp # To upload builds - lftp # To upload builds