ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Travis: Attempt to fix

This commit is contained in:
Vicki Pfau 2018-06-25 15:52:49 -07:00
parent ad49828c4f
commit 302d4860f3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis-deps.sh
View File

@ -1,16 +1,17 @@
#!/bin/sh #!/bin/sh
if [ $TRAVIS_OS_NAME = "osx" ]; then if [ $TRAVIS_OS_NAME = "osx" ]; then
brew update brew update
brew install qt5 ffmpeg imagemagick sdl2 libzip libpng brew install qt5 ffmpeg imagemagick sdl2 libedit libelf libpng libzip
else else
sudo apt-get clean sudo apt-get clean
sudo add-apt-repository -y ppa:beineri/opt-qt542-trusty
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
sudo apt-get install -y -q cmake libedit-dev libmagickwand-dev \ sudo apt-get install -y -q cmake libedit-dev libelf-dev libmagickwand-dev \
libpng-dev libsdl2-dev libzip-dev qtbase5-dev \ libpng-dev libsdl2-dev libzip-dev qt54base qt54multimedia \
libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \ libavcodec-dev libavutil-dev libavformat-dev libavresample-dev \
libavutil-dev libavformat-dev libavresample-dev libswscale-dev libswscale-dev
if [ "$CC" == "gcc" ]; then if [ "$CC" == "gcc" ]; then
sudo apt-get install -y -q gcc-5 g++-5 sudo apt-get install -y -q gcc-5 g++-5
export CC=gcc-5 export CC=gcc-5

2
.travis.yml
View File

@ -11,4 +11,4 @@ matrix:
before_install: before_install:
- source ./.travis-deps.sh - source ./.travis-deps.sh
script: mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 .. && make -j2 script: mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH='/usr/local/opt/qt5;/opt/qt54' .. && make -j2