X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=SConscript;h=69b425af2871337f26bdbc7789b78c362b51c196;hb=e0ca292ea49f929960e9dd19221c10cfa9faa760;hp=cc34733bf0507aaee56452ce3a6b5b62a7f5d895;hpb=09e32d40dcf50aa20a147dcb607c0af8ba837bd5;p=supertux.git

diff --git a/SConscript b/SConscript
index cc34733bf..69b425af2 100644
--- a/SConscript
+++ b/SConscript
@@ -20,16 +20,14 @@ class Project:
         self.build_tinygettext()
         self.build_binreloc()
         self.build_findlocale()
+        self.build_miniswig()
         self.build_supertux()
         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/", "."])
@@ -46,11 +44,43 @@ class Project:
                                              Glob("external/squirrel/sqstdlib/*.cpp") +
                                              Glob("external/squirrel/sqstdlib/*.c"))
 
+    def build_miniswig(self):
+        env = Environment(CPPPATH=[".", "tools/miniswig/"])
+        miniswig_bin = env.Program('miniswig',
+                                   ['tools/miniswig/parser.yy',
+                                    'tools/miniswig/lexer.ll',
+                                    'tools/miniswig/create_docu.cpp',
+                                    'tools/miniswig/xmlwriter.cpp',
+                                    'tools/miniswig/create_wrapper.cpp',
+                                    'tools/miniswig/main.cpp',
+                                    'tools/miniswig/tree.cpp'])
+
+        # env = self.env.Clone()
+        # env.Append(MINISWIG=miniswig_bin)
+
+        # env.Depends(env.Command('src/scripting/miniswig.tmp', 'src/scripting/wrapper.interface.hpp',
+        #                         ["$CXX -E -Isrc/ -x c -CC $SOURCE -o $TARGET -DSCRIPTING_API"]),
+        #             ['src/scripting/interface.hpp',
+        #              'src/scripting/game_objects.hpp'])
+
+        # env.Depends(env.Command(['src/scripting/wrapper.cpp', 'src/scripting/wrapper.hpp'], 'src/scripting/miniswig.tmp',
+        #                         ["$MINISWIG --input $SOURCE --output-cpp ${TARGETS[0]} --output-hpp ${TARGETS[1]} "+
+        #                          "--module windstille --select-namespace Scripting"]),
+        #             miniswig_bin)
+        
+        # g++ -x "c++" -E -CC -DSCRIPTING_API src/scripting/wrapper.interface.hpp -o miniswig.tmp -Isrc
+        # tools/miniswig/miniswig --input miniswig.tmp \
+        #                         --output-cpp src/scripting/wrapper.cpp \
+        #                         --output-hpp src/scripting/wrapper.hpp \
+        #                         --module supertux \
+        #                         --select-namespace scripting
+        
     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
                                         "."],
@@ -60,7 +90,7 @@ class Project:
                                          "-Wall",
                                          "-Wextra",
                                          "-Wnon-virtual-dtor",
-                                         # "-Weffc++",
+                                         "-Weffc++",
                                          # "-Wconversion",
                                          "-Werror",
                                          # "-Wshadow",
@@ -73,7 +103,7 @@ class Project:
         self.env.ParseConfig("pkg-config --libs --cflags openal")
         self.env.ParseConfig("pkg-config --libs --cflags vorbis vorbisfile ogg")
         self.env.Append(LIBS=[self.libsquirrel, self.libbinreloc, self.libtinygettext, self.libfindlocale])
-        self.env.Append(LIBS=["SDL_image", "curl", "GL", "physfs"])
+        self.env.Append(LIBS=["SDL_image", "curl", "GL", "GLEW", "physfs"])
 
         # Create config.h
         self.iconv_const = 0