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

Sorting the qmake path

Browse Source
This commit is contained in:
Xawotihs
2019-09-08 23:47:19 +02:00
committed by GitHub
parent 91bfa11a4f
commit 7d51b985a6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -19,7 +19,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 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 &&
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 &&
export QMAKE="qmake -qt=qt5";
fi fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update && brew update &&
@@ -27,6 +28,7 @@ before_install:
brew install qt5 && brew install qt5 &&
brew install ant && brew install ant &&
pwd && pwd &&
export QMAKE="/usr/local/opt/qt5/bin/qmake -qt=qt5" &&
ls; ls;
fi fi
@@ -37,10 +39,6 @@ before_install:
export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" &&
wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma; wget -O sdk.lzma http://downloads.sourceforge.net/project/minpspw/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma;
fi fi
# Building for Qt here
- if [ "$BUILD_Qt" == "YES" ]; then
export QMAKE="qmake -qt=qt5";
fi
# Building for Android here # Building for Android here
- if [ "$BUILD_ANDROID" == "YES" ]; then - if [ "$BUILD_ANDROID" == "YES" ]; then
export ANDROID="android-sdk-linux/tools/android" && export ANDROID="android-sdk-linux/tools/android" &&