diff --git a/.travis.yml b/.travis.yml index 170ae4b2f..651eebae0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,9 @@ before_install: - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - export ANDROID="android-sdk-linux/tools/android" install: +- sudo add-apt-repository ppa:tobydox/mingw -y - sudo apt-get update -qq -- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi +- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq mingw32-x mingw32-x-qt; fi - 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 - tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv diff --git a/travis-script.sh b/travis-script.sh index db926b1c8..e4fe26680 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -42,6 +42,15 @@ cd .. qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR make -j 8 +# we're cross-compiling a Qt Windows version here, +# PATH is only set here to prevent colision +export PATH="$PATH:/opt/mingw32/bin" +mkdir qt-win-cross +cd qt-win-cross +/opt/mingw32/bin/qmake ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics +make -j 8 +cd .. + # we create resource package cd projects/mtg/bin/Res python createResourceZip.py