Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved apt-get of Qt into linux part

Browse Source
This commit is contained in:
Xawotihs
2015-10-31 21:45:36 +01:00
parent b473238f02
commit c981586bcf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -2
View File
@@ -16,7 +16,8 @@ before_install:
sudo apt-get -qq update && sudo apt-get -qq update &&
sudo apt-get -qq install g++-4.8 && sudo apt-get -qq install g++-4.8 &&
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 &&
sudo apt-get -qq install cmake; sudo apt-get -qq install cmake &&
sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev;
fi fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update && brew update &&
@@ -42,7 +43,6 @@ before_install:
fi fi
# Building for Qt here # Building for Qt here
- if [ "$BUILD_TYPE" == "Qt" ]; then - if [ "$BUILD_TYPE" == "Qt" ]; then
sudo apt-get install -qq 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
# Building for SDL here # Building for SDL here