Had to change the #includes of dependend headers from "dir/header.h" to "../dir...

SVN-Revision: 1618

diff --git a/lib/app/globals.cpp b/lib/app/globals.cpp
index 56f0fbf..de09e4b 100644 (file)
--- a/lib/app/globals.cpp
+++ b/lib/app/globals.cpp
@@ -18,7 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
-#include "app/globals.h"
+#include "../app/globals.h"
 
 namespace SuperTux {
 

diff --git a/lib/app/globals.h b/lib/app/globals.h
index 73c600b..2495017 100644 (file)
--- a/lib/app/globals.h
+++ b/lib/app/globals.h
@@ -26,9 +26,9 @@
 
 #include "SDL.h"
 
-#include "video/font.h"
-#include "gui/menu.h"
-#include "gui/mousecursor.h"
+#include "../video/font.h"
+#include "../gui/menu.h"
+#include "../gui/mousecursor.h"
 
 namespace SuperTux
   {

diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp
index c51b0ce..2daf4d9 100644 (file)
--- a/lib/app/setup.cpp
+++ b/lib/app/setup.cpp
@@ -41,15 +41,15 @@
 
 #include <cctype>
 
-#include "app/globals.h"
-#include "app/defines.h"
-#include "app/setup.h"
-#include "video/screen.h"
-#include "video/surface.h"
-#include "gui/menu.h"
-#include "utils/configfile.h"
-#include "audio/sound_manager.h"
-#include "app/gettext.h"
+#include "../app/globals.h"
+#include "../app/defines.h"
+#include "../app/setup.h"
+#include "../video/screen.h"
+#include "../video/surface.h"
+#include "../gui/menu.h"
+#include "../utils/configfile.h"
+#include "../audio/sound_manager.h"
+#include "../app/gettext.h"
 
 using namespace SuperTux;
 

diff --git a/lib/app/setup.h b/lib/app/setup.h
index 53a8b17..3447f05 100644 (file)
--- a/lib/app/setup.h
+++ b/lib/app/setup.h
@@ -22,9 +22,9 @@
 
 #include <vector>
 #include <string>
-#include "gui/menu.h"
-#include "audio/sound.h"
-#include "special/base.h"
+#include "../gui/menu.h"
+#include "../audio/sound.h"
+#include "../special/base.h"
 
 namespace SuperTux {
 

diff --git a/lib/audio/musicref.cpp b/lib/audio/musicref.cpp
index a2c1316..0ff362b 100644 (file)
--- a/lib/audio/musicref.cpp
+++ b/lib/audio/musicref.cpp
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "audio/musicref.h"
+#include "../audio/musicref.h"
 
 using namespace SuperTux;
 

diff --git a/lib/audio/musicref.h b/lib/audio/musicref.h
index 70a4c8a..d433787 100644 (file)
--- a/lib/audio/musicref.h
+++ b/lib/audio/musicref.h
@@ -20,7 +20,7 @@
 #ifndef SUPERTUX_MUSICREF_H
 #define SUPERTUX_MUSICREF_H
 
-#include "audio/sound_manager.h"
+#include "../audio/sound_manager.h"
 
 namespace SuperTux
   {

diff --git a/lib/audio/sound.cpp b/lib/audio/sound.cpp
index 3ba2752..c35e192 100644 (file)
--- a/lib/audio/sound.cpp
+++ b/lib/audio/sound.cpp
@@ -19,7 +19,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <string>
-#include "audio/sound.h"
+#include "../audio/sound.h"
 
 /*global variable*/
 bool use_sound = true;    /* handle sound on/off menu and command-line option */

diff --git a/lib/audio/sound_manager.cpp b/lib/audio/sound_manager.cpp
index c34f91f..fd4b231 100644 (file)
--- a/lib/audio/sound_manager.cpp
+++ b/lib/audio/sound_manager.cpp
@@ -20,12 +20,12 @@
 #include <cmath>
 #include <cassert>
 
-#include "audio/sound_manager.h"
-#include "audio/musicref.h"
-#include "audio/sound.h"
-#include "app/globals.h"
-#include "app/setup.h"
-#include "special/moving_object.h"
+#include "../audio/sound_manager.h"
+#include "../audio/musicref.h"
+#include "../audio/sound.h"
+#include "../app/globals.h"
+#include "../app/setup.h"
+#include "../special/moving_object.h"
 
 using namespace SuperTux;
 

diff --git a/lib/audio/sound_manager.h b/lib/audio/sound_manager.h
index 7d10dbd..48a1440 100644 (file)
--- a/lib/audio/sound_manager.h
+++ b/lib/audio/sound_manager.h
@@ -24,7 +24,7 @@
 #include <map>
 
 #include "SDL_mixer.h"
-#include "math/vector.h"
+#include "../math/vector.h"
 
 namespace SuperTux
   {

diff --git a/lib/gui/button.cpp b/lib/gui/button.cpp
index 680ee4e..8c82519 100644 (file)
--- a/lib/gui/button.cpp
+++ b/lib/gui/button.cpp
@@ -21,11 +21,11 @@
 #include <cstring>
 #include <cstdlib>
 
-#include "app/setup.h"
-#include "video/screen.h"
-#include "video/drawing_context.h"
-#include "app/globals.h"
-#include "gui/button.h"
+#include "../app/setup.h"
+#include "../video/screen.h"
+#include "../video/drawing_context.h"
+#include "../app/globals.h"
+#include "../gui/button.h"
 
 using namespace SuperTux;
 

diff --git a/lib/gui/button.h b/lib/gui/button.h
index a5fb9e6..2b265b5 100644 (file)
--- a/lib/gui/button.h
+++ b/lib/gui/button.h
@@ -23,8 +23,8 @@
 
 #include <vector>
 
-#include "video/surface.h"
-#include "special/timer.h"
+#include "../video/surface.h"
+#include "../special/timer.h"
 
 namespace SuperTux
   {

diff --git a/lib/gui/menu.cpp b/lib/gui/menu.cpp
index 7ec10c7..30c0b9c 100644 (file)
--- a/lib/gui/menu.cpp
+++ b/lib/gui/menu.cpp
@@ -29,15 +29,15 @@
 #include <string>
 #include <cassert>
 
-#include "app/globals.h"
-#include "gui/menu.h"
-#include "video/screen.h"
-#include "video/drawing_context.h"
-#include "app/setup.h"
-#include "audio/sound.h"
-#include "special/timer.h"
-#include "app/gettext.h"
-#include "math/vector.h"
+#include "../app/globals.h"
+#include "../gui/menu.h"
+#include "../video/screen.h"
+#include "../video/drawing_context.h"
+#include "../app/setup.h"
+#include "../audio/sound.h"
+#include "../special/timer.h"
+#include "../app/gettext.h"
+#include "../math/vector.h"
 
 using namespace SuperTux;
 

diff --git a/lib/gui/menu.h b/lib/gui/menu.h
index a1e5c34..eae2a47 100644 (file)
--- a/lib/gui/menu.h
+++ b/lib/gui/menu.h
@@ -24,11 +24,11 @@
 
 #include "SDL.h"
 
-#include "video/surface.h"
-#include "special/timer.h"
-#include "special/base.h"
-#include "special/stringlist.h"
-#include "gui/mousecursor.h"
+#include "../video/surface.h"
+#include "../special/timer.h"
+#include "../special/base.h"
+#include "../special/stringlist.h"
+#include "../gui/mousecursor.h"
 
 namespace SuperTux
   {

diff --git a/lib/gui/mousecursor.cpp b/lib/gui/mousecursor.cpp
index 3556fb1..e5252a4 100644 (file)
--- a/lib/gui/mousecursor.cpp
+++ b/lib/gui/mousecursor.cpp
@@ -17,8 +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 "video/drawing_context.h"
-#include "gui/mousecursor.h"
+#include "../video/drawing_context.h"
+#include "../gui/mousecursor.h"
 
 using namespace SuperTux;
 

diff --git a/lib/gui/mousecursor.h b/lib/gui/mousecursor.h
index 0842b62..c6b19f3 100644 (file)
--- a/lib/gui/mousecursor.h
+++ b/lib/gui/mousecursor.h
@@ -22,8 +22,8 @@
 
 #include <string>
 
-#include "special/timer.h"
-#include "video/surface.h"
+#include "../special/timer.h"
+#include "../video/surface.h"
 
 namespace SuperTux
   {

diff --git a/lib/math/physic.cpp b/lib/math/physic.cpp
index 37d84fb..0873cde 100644 (file)
--- a/lib/math/physic.cpp
+++ b/lib/math/physic.cpp
@@ -20,8 +20,8 @@
 
 #include <cstdio>
 
-#include "math/physic.h"
-#include "special/timer.h"
+#include "../math/physic.h"
+#include "../special/timer.h"
 
 using namespace SuperTux;
 

diff --git a/lib/math/physic.h b/lib/math/physic.h
index bae4dd3..f269cb8 100644 (file)
--- a/lib/math/physic.h
+++ b/lib/math/physic.h
@@ -21,7 +21,7 @@
 #ifndef SUPERTUX_PHYSIC_H
 #define SUPERTUX_PHYSIC_H
 
-#include "math/vector.h"
+#include "../math/vector.h"
 
 namespace SuperTux
   {

diff --git a/lib/math/vector.cpp b/lib/math/vector.cpp
index d3a3225..1b04518 100644 (file)
--- a/lib/math/vector.cpp
+++ b/lib/math/vector.cpp
@@ -19,7 +19,7 @@
 
 #include <cmath>
 
-#include "math/vector.h"
+#include "../math/vector.h"
 
 using namespace SuperTux;
 

diff --git a/lib/special/game_object.cpp b/lib/special/game_object.cpp
index c8f457b..5b27dab 100644 (file)
--- a/lib/special/game_object.cpp
+++ b/lib/special/game_object.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "special/game_object.h"
+#include "../special/game_object.h"
 
 using namespace SuperTux;
 

diff --git a/lib/special/moving_object.cpp b/lib/special/moving_object.cpp
index 7ed991d..b874408 100644 (file)
--- a/lib/special/moving_object.cpp
+++ b/lib/special/moving_object.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "special/moving_object.h"
+#include "../special/moving_object.h"
 
 using namespace SuperTux;
 

diff --git a/lib/special/moving_object.h b/lib/special/moving_object.h
index 689f92b..0399600 100644 (file)
--- a/lib/special/moving_object.h
+++ b/lib/special/moving_object.h
@@ -20,9 +20,9 @@
 #ifndef SUPERTUX_MOVING_OBJECT_H
 #define SUPERTUX_MOVING_OBJECT_H
 
-#include "special/base.h"
-#include "special/game_object.h"
-#include "math/vector.h"
+#include "../special/base.h"
+#include "../special/game_object.h"
+#include "../math/vector.h"
 //#include "rectangle.h"
 
 namespace SuperTux

diff --git a/lib/special/sprite.cpp b/lib/special/sprite.cpp
index fb4d10c..75e6e54 100644 (file)
--- a/lib/special/sprite.cpp
+++ b/lib/special/sprite.cpp
@@ -20,10 +20,10 @@
 #include <iostream>
 #include <cmath>
 
-#include "app/globals.h"
-#include "app/setup.h"
-#include "special/sprite.h"
-#include "video/drawing_context.h"
+#include "../app/globals.h"
+#include "../app/setup.h"
+#include "../special/sprite.h"
+#include "../video/drawing_context.h"
 
 using namespace SuperTux;
 

diff --git a/lib/special/sprite.h b/lib/special/sprite.h
index 394e44b..8de7d5c 100644 (file)
--- a/lib/special/sprite.h
+++ b/lib/special/sprite.h
@@ -23,9 +23,9 @@
 #include <string>
 #include <vector>
 
-#include "utils/lispreader.h"
-#include "video/surface.h"
-#include "math/vector.h"
+#include "../utils/lispreader.h"
+#include "../video/surface.h"
+#include "../math/vector.h"
 
 namespace SuperTux
   {

diff --git a/lib/special/sprite_manager.cpp b/lib/special/sprite_manager.cpp
index 65bcfe7..7c4bc1d 100644 (file)
--- a/lib/special/sprite_manager.cpp
+++ b/lib/special/sprite_manager.cpp
@@ -19,8 +19,8 @@
 
 #include <iostream>
 
-#include "utils/lispreader.h"
-#include "special/sprite_manager.h"
+#include "../utils/lispreader.h"
+#include "../special/sprite_manager.h"
 
 using namespace SuperTux;
 

diff --git a/lib/special/sprite_manager.h b/lib/special/sprite_manager.h
index a2e4340..8663081 100644 (file)
--- a/lib/special/sprite_manager.h
+++ b/lib/special/sprite_manager.h
@@ -22,7 +22,7 @@
 
 #include <map>
 
-#include "special/sprite.h"
+#include "../special/sprite.h"
 
 namespace SuperTux
   {

diff --git a/lib/special/stringlist.cpp b/lib/special/stringlist.cpp
index 01ed687..a9f73cc 100644 (file)
--- a/lib/special/stringlist.cpp
+++ b/lib/special/stringlist.cpp
@@ -20,7 +20,7 @@
 
 #include "string.h"
 #include "stdlib.h"
-#include "special/stringlist.h"
+#include "../special/stringlist.h"
 
 using namespace SuperTux;
 

diff --git a/lib/special/timer.cpp b/lib/special/timer.cpp
index 0791f71..ae07632 100644 (file)
--- a/lib/special/timer.cpp
+++ b/lib/special/timer.cpp
@@ -19,7 +19,7 @@
 //  02111-1307, USA.
 
 #include "SDL.h"
-#include "special/timer.h"
+#include "../special/timer.h"
 
 using namespace SuperTux;
 

diff --git a/lib/utils/configfile.cpp b/lib/utils/configfile.cpp
index 4b50531..0ef0374 100644 (file)
--- a/lib/utils/configfile.cpp
+++ b/lib/utils/configfile.cpp
@@ -20,9 +20,9 @@
 #include <cstdlib>
 #include <string>
 
-#include "utils/configfile.h"
-#include "app/setup.h"
-#include "app/globals.h"
+#include "../utils/configfile.h"
+#include "../app/setup.h"
+#include "../app/globals.h"
 
 using namespace SuperTux;
 

diff --git a/lib/utils/configfile.h b/lib/utils/configfile.h
index ad18daf..897982c 100644 (file)
--- a/lib/utils/configfile.h
+++ b/lib/utils/configfile.h
@@ -20,7 +20,7 @@
 #ifndef SUPERTUX_CONFIGFILE_H
 #define SUPERTUX_CONFIGFILE_H
 
-#include "utils/lispreader.h"
+#include "../utils/lispreader.h"
 
 namespace SuperTux {
 

diff --git a/lib/utils/lispreader.cpp b/lib/utils/lispreader.cpp
index 43283fc..d7d141d 100644 (file)
--- a/lib/utils/lispreader.cpp
+++ b/lib/utils/lispreader.cpp
@@ -27,9 +27,9 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "app/globals.h"
-#include "app/setup.h"
-#include "utils/lispreader.h"
+#include "../app/globals.h"
+#include "../app/setup.h"
+#include "../utils/lispreader.h"
 
 using namespace SuperTux;
 

diff --git a/lib/utils/lispreader.h b/lib/utils/lispreader.h
index e1a2b59..eb7581c 100644 (file)
--- a/lib/utils/lispreader.h
+++ b/lib/utils/lispreader.h
@@ -31,7 +31,7 @@
 
 #include <zlib.h>
 
-#include "utils/exceptions.h"
+#include "../utils/exceptions.h"
 
 namespace SuperTux {
 

diff --git a/lib/utils/lispwriter.cpp b/lib/utils/lispwriter.cpp
index 02dd921..c92b7c3 100644 (file)
--- a/lib/utils/lispwriter.cpp
+++ b/lib/utils/lispwriter.cpp
@@ -19,7 +19,7 @@
 
 #include <iostream>
 
-#include "utils/lispwriter.h"
+#include "../utils/lispwriter.h"
 
 using namespace SuperTux;
 

diff --git a/lib/video/drawing_context.cpp b/lib/video/drawing_context.cpp
index 6a6b753..f6e9af1 100644 (file)
--- a/lib/video/drawing_context.cpp
+++ b/lib/video/drawing_context.cpp
@@ -20,10 +20,10 @@
 #include <cassert>
 #include <iostream>
 
-#include "video/drawing_context.h"
-#include "video/surface.h"
-#include "app/globals.h"
-#include "video/font.h"
+#include "../video/drawing_context.h"
+#include "../video/surface.h"
+#include "../app/globals.h"
+#include "../video/font.h"
 
 using namespace SuperTux;
 

diff --git a/lib/video/drawing_context.h b/lib/video/drawing_context.h
index b200e7b..e0b2df5 100644 (file)
--- a/lib/video/drawing_context.h
+++ b/lib/video/drawing_context.h
@@ -24,9 +24,9 @@
 
 #include "SDL.h"
 
-#include "math/vector.h"
-#include "video/screen.h"
-#include "video/surface.h"
+#include "../math/vector.h"
+#include "../video/screen.h"
+#include "../video/surface.h"
 
 namespace SuperTux
   {

diff --git a/lib/video/font.cpp b/lib/video/font.cpp
index fe9f288..5b5ac85 100644 (file)
--- a/lib/video/font.cpp
+++ b/lib/video/font.cpp
@@ -21,11 +21,11 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "app/globals.h"
-#include "video/screen.h"
-#include "video/font.h"
-#include "video/drawing_context.h"
-#include "utils/lispreader.h"
+#include "../app/globals.h"
+#include "../video/screen.h"
+#include "../video/font.h"
+#include "../video/drawing_context.h"
+#include "../utils/lispreader.h"
 
 using namespace SuperTux;
 

diff --git a/lib/video/font.h b/lib/video/font.h
index f359762..d0b328b 100644 (file)
--- a/lib/video/font.h
+++ b/lib/video/font.h
@@ -23,8 +23,8 @@
 
 #include <string>
 
-#include "video/surface.h"
-#include "math/vector.h"
+#include "../video/surface.h"
+#include "../math/vector.h"
 
 namespace SuperTux
   {

diff --git a/lib/video/screen.cpp b/lib/video/screen.cpp
index 70b1d5b..284512c 100644 (file)
--- a/lib/video/screen.cpp
+++ b/lib/video/screen.cpp
@@ -33,11 +33,11 @@
 #include <ctype.h>
 #endif
 
-#include "video/screen.h"
-#include "app/globals.h"
-#include "video/drawing_context.h"
-#include "special/base.h"
-#include "math/vector.h"
+#include "../video/screen.h"
+#include "../app/globals.h"
+#include "../video/drawing_context.h"
+#include "../special/base.h"
+#include "../math/vector.h"
 
 using namespace SuperTux;
 

diff --git a/lib/video/surface.cpp b/lib/video/surface.cpp
index 8550573..7142278 100644 (file)
--- a/lib/video/surface.cpp
+++ b/lib/video/surface.cpp
@@ -25,9 +25,9 @@
 #include "SDL.h"
 #include "SDL_image.h"
 
-#include "video/surface.h"
-#include "app/globals.h"
-#include "app/setup.h"
+#include "../video/surface.h"
+#include "../app/globals.h"
+#include "../app/setup.h"
 
 using namespace SuperTux;
 

diff --git a/lib/video/surface.h b/lib/video/surface.h
index ea9e694..10fe06e 100644 (file)
--- a/lib/video/surface.h
+++ b/lib/video/surface.h
@@ -30,8 +30,8 @@
 
 #include "SDL.h"
 
-#include "math/vector.h"
-#include "video/screen.h"
+#include "../math/vector.h"
+#include "../video/screen.h"
 
 namespace SuperTux
   {