diff --git a/.travis.yml b/.travis.yml index f63cde744..00b5755cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,13 +16,6 @@ before_install: export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download; fi -# Building for Android here - - if [ "$BUILD_ANDROID" == "YES" ]; then - export ANDROID="android-sdk-linux/tools/android" && - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && - wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv; - fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe" && @@ -31,7 +24,14 @@ before_install: sudo apt-get -qq install qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev && export QMAKE="qmake -qt=qt5"; fi - +# Building for Android here + - if [ "$BUILD_ANDROID" == "YES" ]; then + export ANDROID="android-sdk-linux/tools/android" && + if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && + wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && + wget http://dl.google.com/android/android-sdk_r24.3.4-linux.tgz -nv; + fi + install: - if [ "$BUILD_PSP" == "YES" ]; then tar -x --xz -f sdk.lzma;