make it possible to start supertux from top soruce directory

SVN-Revision: 2101

diff --git a/lib/app/gettext.h b/lib/app/gettext.h
index c9b81e3..4eb1085 100644 (file)
--- a/lib/app/gettext.h
+++ b/lib/app/gettext.h
@@ -32,6 +32,8 @@
 
 /* Get declarations of GNU message catalog functions.  */
 #include <libintl.h>
+// needed for LC_ALL constant
+#include <locale.h>
 
 #else
 

diff --git a/lib/app/globals.cpp b/lib/app/globals.cpp
index 0a328d4..81ca98e 100644 (file)
--- a/lib/app/globals.cpp
+++ b/lib/app/globals.cpp
@@ -18,6 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <config.h>
+
 #include "../app/globals.h"
 
 namespace SuperTux {

diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp
index a0b4b90..6245e49 100644 (file)
--- a/lib/app/setup.cpp
+++ b/lib/app/setup.cpp
@@ -17,6 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <config.h>
+
 #include <cassert>
 #include <cstdio>
 #include <iostream>
@@ -285,6 +287,12 @@ void Setup::directories(void)
 
   mkdir((st_dir + "/levels").c_str(), 0755);
 
+  // try current directory as datadir
+  if(datadir.empty()) {
+      if(FileSystem::faccessible("./data/intro.txt"))
+          datadir = "./data";
+  }
+
   // User has not that a datadir, so we try some magic
   if (datadir.empty())
     {

diff --git a/lib/app/setup.h b/lib/app/setup.h
index 3acca6c..9d05267 100644 (file)
--- a/lib/app/setup.h
+++ b/lib/app/setup.h
@@ -24,7 +24,6 @@
 #include <set>
 #include <string>
 #include "../gui/menu.h"
-#include "../special/base.h"
 
 namespace SuperTux {