From 3482afeb847b3faacff3bc538679c7f1f13de7de Mon Sep 17 00:00:00 2001 From: xawotihs Date: Tue, 31 Dec 2013 16:08:59 +0100 Subject: [PATCH] Should fix the build of the graphics versions --- travis-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis-script.sh b/travis-script.sh index ea19459e8..73082192c 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -49,6 +49,8 @@ $ANDROID update project -t 1 -p projects/mtg/Android ant debug -f projects/mtg/Android/build.xml # we're building a Qt version with GUI here +mv ../projects/mtg/bin/Res/settings/options.orig.txt ../projects/mtg/bin/Res/settings/options.txt +mv ../projects/mtg/bin/Res/player/options.orig.txt ../projects/mtg/bin/Res/player/options.txt mkdir qt-gui-build cd qt-gui-build qmake ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics @@ -66,8 +68,6 @@ mkdir build cd build mkdir win-cross cd win-cross -mv ../../projects/mtg/bin/Res/settings/options.orig.txt ../../projects/mtg/bin/Res/settings/options.txt -mv ../../projects/mtg/bin/Res/player/options.orig.txt ../../projects/mtg/bin/Res/player/options.txt /opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics make -j 8 cd release