First try on matrix without cmake
This commit is contained in:
+23
-12
@@ -4,16 +4,30 @@ branches:
|
|||||||
except:
|
except:
|
||||||
- latest-master
|
- latest-master
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- os: linux
|
||||||
|
env: BUILD_PSP=YES BUILD_ANDROID=YES BUILD_Qt=YES BUILD_MAC=NO
|
||||||
|
- os: osx
|
||||||
|
env: BUILD_PSP=NO BUILD_ANDROID=NO BUILD_Qt=YES BUILD_MAC=YES
|
||||||
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- export BUILD_PSP=YES
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||||
- export BUILD_ANDROID=YES
|
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe" &&
|
||||||
- export BUILD_Qt=YES
|
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main" &&
|
||||||
- export BUILD_MAC=NO
|
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test &&
|
||||||
# Only building on Mac when not handling pull request
|
sudo apt-get -qq update &&
|
||||||
# - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
|
sudo apt-get -qq install g++-4.8 &&
|
||||||
# export BUILD_MAC=YES;
|
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
|
||||||
# fi
|
fi
|
||||||
- sudo apt-get update -qq
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||||
|
brew update &&
|
||||||
|
brew install dpkg &&
|
||||||
|
pwd &&
|
||||||
|
ls;
|
||||||
|
fi
|
||||||
|
|
||||||
# Building for PSP here
|
# Building for PSP here
|
||||||
- if [ "$BUILD_PSP" == "YES" ]; then
|
- if [ "$BUILD_PSP" == "YES" ]; then
|
||||||
export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" &&
|
export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" &&
|
||||||
@@ -23,9 +37,6 @@ before_install:
|
|||||||
fi
|
fi
|
||||||
# Building for Qt here
|
# Building for Qt here
|
||||||
- if [ "$BUILD_Qt" == "YES" ]; then
|
- if [ "$BUILD_Qt" == "YES" ]; then
|
||||||
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe" &&
|
|
||||||
sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main" &&
|
|
||||||
sudo apt-get -qq update &&
|
|
||||||
sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
|
sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
|
||||||
export QMAKE="qmake -qt=qt5";
|
export QMAKE="qmake -qt=qt5";
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user