From 555fb3ae9349de04407f3f62ee57ad89fb3d4b9b Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 2 Aug 2014 18:54:28 +0200 Subject: [PATCH] Updated Qt building scripts to use qt5 qmake and no fmod --- .travis.yml | 4 +--- projects/mtg/wagic.pri | 1 - travis-script.sh | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index abb742e75..6411cdfb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ before_install: - 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 - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev +- export QMAKE="qmake -qt=qt5" - 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 - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv @@ -21,9 +22,6 @@ install: - $ANDROID list sdk --extended -a - echo yes | $ANDROID update sdk -a --filter "tools","platform-tools","build-tools-19.1.0","android-10" --no-ui --force - sudo pip install pyjavaproperties -before_script: -- qmake -qt=qt5 -v -- qmake -qt=qt5 script: ./travis-script.sh env: global: diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 5122f3d72..7360f681e 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -43,7 +43,6 @@ INCLUDEPATH += ../../Boost INCLUDEPATH += include unix:!symbian:LIBS += -lz -windows:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib windows:LIBS += ../../JGE/Dependencies/lib/zlibd.lib PRECOMPILED_HEADER = include/PrecompiledHeader.h diff --git a/travis-script.sh b/travis-script.sh index b42f6c070..3cd466e71 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -64,12 +64,12 @@ ant debug -f projects/mtg/Android/build.xml # we're building a Qt version with GUI here mkdir qt-gui-build cd qt-gui-build -qmake ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics +$QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics make -j 8 cd .. # let's try an Intel linux binary in debug text-mode-only -qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR +$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,