Added StringUtil class, some small cleanup in World

[supertux.git] / SConscript

diff --git a/SConscript b/SConscript
index 2f2e4ee..6e1a050 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -24,12 +24,9 @@ class Project:
         self.build_tests()
 
     def build_tinygettext(self):
-        env = Environment(CPPPATH=["external/tinygettext/",
-                                   "external/squirrel/include/",
-                                   ".",
-                                   "src"])
+        env = Environment(CPPPATH=[".", "src"])
         env.ParseConfig("sdl-config --libs --cflags")
-        self.libtinygettext = env.StaticLibrary("tinygettext", Glob("external/tinygettext/*.cpp"))
+        self.libtinygettext = env.StaticLibrary("tinygettext", Glob("external/tinygettext/tinygettext/*.cpp"))
 
     def build_binreloc(self):
         env = Environment(CPPPATH=["external/binreloc/", "."])
@@ -49,8 +46,9 @@ class Project:
     def build_supertux(self):
         self.env = Environment(CPPPATH=["external/squirrel/include/",
                                         "external/findlocale/",
-                                        "external/",
-                                        "external/obstack",
+                                        "external/binreloc/",
+                                        "external/obstack/",
+                                        "external/tinygettext/",
                                         "src/",
                                         "/usr/include/AL/", # yuck
                                         "."],
@@ -84,7 +82,6 @@ class Project:
         config_h.write('#define APPDATADIR "data"\n')
         config_h.write('#define HAVE_LIBCURL 1\n')
         config_h.write('#define HAVE_OPENGL 1\n')
-        config_h.write('#define DEBUG 1\n')
         config_h.write('#define ICONV_CONST %s\n' % self.iconv_const)
         config_h.close()
 
@@ -92,7 +89,7 @@ class Project:
         version_h.close()
 
         # base source
-        supertux_sources = Glob("src/*.cpp") + Glob("src/*/*.cpp")
+        supertux_sources = Glob("src/*.cpp") + Glob("src/*/*.cpp") + Glob("src/supertux/menu/*.cpp")
 
         # optional video drivers
         supertux_sources += Glob("src/video/gl/*.cpp")