Merge pull request #576 from ZobyTwo/directories_1

Do not specify the system directory in JGE

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);

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