From 657479e0e4b5281aa22e0c0c38fc9362d80bfef6 Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Wed, 4 Dec 2013 11:44:36 +0100 Subject: [PATCH] Do not specify the system directory in JGE --- JGE/src/JFileSystem.cpp | 2 +- travis-script.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp index cb377aa49..63ee77244 100644 --- a/JGE/src/JFileSystem.cpp +++ b/JGE/src/JFileSystem.cpp @@ -126,7 +126,7 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath) DebugTrace("User path " << userPath); #elif defined (QT_CONFIG) - QDir sysDir("projects/mtg/bin/Res"); + QDir sysDir(RESDIR); QDir dir(QDir::homePath()); dir.mkdir(USERDIR); dir.cd(USERDIR); diff --git a/travis-script.sh b/travis-script.sh index 17f0fbdec..b24955552 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -27,4 +27,5 @@ qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_S make -j 8 # and finish by running the testsuite -./wagic +cd projects/mtg +./../../wagic