Fixed some include path

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6057 837edb03-e0f3-0310-88ca-d4d4e8b29345

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 249b9ff..915c2db 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ LINK_DIRECTORIES(external/squirrel)
 
 include_directories (${SUPERTUX_SOURCE_DIR}/src/)
 include_directories (${SUPERTUX_SOURCE_DIR}/external/squirrel/include/)
-include_directories (${SUPERTUX_SOURCE_DIR}/external/)
+include_directories (${SUPERTUX_SOURCE_DIR}/external/tinygettext/)
 include_directories (${SUPERTUX_SOURCE_DIR}/external/findlocale/)
 include_directories (${SUPERTUX_SOURCE_DIR}/external/obstack/)
 
@@ -131,7 +131,7 @@ include_directories (${SUPERTUX_SOURCE_DIR}/external/obstack/)
 
 FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${SUPERTUX_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
 
-FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${SUPERTUX_SOURCE_DIR} src/main.cpp src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp external/tinygettext/*.cpp)
+FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${SUPERTUX_SOURCE_DIR} src/main.cpp src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp external/tinygettext/tinygettext/*.cpp)
 
 IF(HAVE_OPENGL)
   FILE(GLOB SUPERTUX_OPENGL_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/video/gl/*.cpp)
@@ -302,6 +302,7 @@ ENDIF(WIN32)
 
 ## Add binreloc.c if enabled
 IF(ENABLE_BINRELOC)
+  include_directories (${SUPERTUX_SOURCE_DIR}/external/binreloc/)
   SET(SUPERTUX_SOURCES_C ${SUPERTUX_SOURCES_C} ${SUPERTUX_SOURCE_DIR}/external/binreloc/binreloc.c)
 ENDIF(ENABLE_BINRELOC)
 

diff --git a/SConscript b/SConscript
index cc34733..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
                                         "."],