From 2c0b106dc95a771b091c492dccbdb41cd38e1abe Mon Sep 17 00:00:00 2001 From: grumbel Date: Thu, 19 Nov 2009 18:41:56 +0000 Subject: [PATCH] Switched from #include "" to #include <> for external/ libraries git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6056 837edb03-e0f3-0310-88ca-d4d4e8b29345 --- src/lisp/parser.cpp | 2 +- src/lisp/parser.hpp | 3 ++- src/supertux/globals.cpp | 2 +- src/supertux/main.cpp | 2 +- src/video/drawing_context.hpp | 3 +-- src/video/lightmap.hpp | 8 +++----- src/video/renderer.hpp | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp index c0fc5f13c..232cfc099 100644 --- a/src/lisp/parser.cpp +++ b/src/lisp/parser.cpp @@ -16,6 +16,7 @@ #include #include +#include #include "lisp/lisp.hpp" #include "lisp/parser.hpp" @@ -23,7 +24,6 @@ #include "physfs/ifile_stream.hpp" #include "physfs/ifile_streambuf.hpp" #include "supertux/globals.hpp" -#include "tinygettext/tinygettext.hpp" #include "supertux/gameconfig.hpp" diff --git a/src/lisp/parser.hpp b/src/lisp/parser.hpp index 8d3927b39..7bb9903e2 100644 --- a/src/lisp/parser.hpp +++ b/src/lisp/parser.hpp @@ -17,8 +17,9 @@ #ifndef HEADER_SUPERTUX_LISP_PARSER_HPP #define HEADER_SUPERTUX_LISP_PARSER_HPP +#include + #include "lisp/lexer.hpp" -#include "obstack/obstack.h" namespace tinygettext { class Dictionary; diff --git a/src/supertux/globals.cpp b/src/supertux/globals.cpp index 44359595e..4672875f4 100644 --- a/src/supertux/globals.cpp +++ b/src/supertux/globals.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "supertux/globals.hpp" -#include "tinygettext/tinygettext.hpp" +#include SDL_Surface* g_screen; JoystickKeyboardController* g_main_controller = 0; diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp index bef5b08cb..57078c5a9 100644 --- a/src/supertux/main.cpp +++ b/src/supertux/main.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #ifdef MACOSX namespace supertux_apple { @@ -33,7 +34,6 @@ namespace supertux_apple { #include "addon/addon_manager.hpp" #include "audio/sound_manager.hpp" -#include "binreloc/binreloc.h" #include "control/joystickkeyboardcontroller.hpp" #include "math/random_generator.hpp" #include "physfs/ifile_stream.hpp" diff --git a/src/video/drawing_context.hpp b/src/video/drawing_context.hpp index 302b90e23..e37d28b64 100644 --- a/src/video/drawing_context.hpp +++ b/src/video/drawing_context.hpp @@ -20,12 +20,11 @@ #include #include #include - #include +#include #include "math/rect.hpp" #include "math/vector.hpp" -#include "obstack/obstack.h" #include "video/color.hpp" #include "video/drawing_request.hpp" #include "video/font.hpp" diff --git a/src/video/lightmap.hpp b/src/video/lightmap.hpp index a96b4a8e1..ab1acbe0c 100644 --- a/src/video/lightmap.hpp +++ b/src/video/lightmap.hpp @@ -17,17 +17,15 @@ #ifndef HEADER_SUPERTUX_VIDEO_LIGHTMAP_HPP #define HEADER_SUPERTUX_VIDEO_LIGHTMAP_HPP +#include #include +#include +#include #include #include -#include - -#include - #include "math/rect.hpp" #include "math/vector.hpp" -#include "obstack/obstack.h" #include "video/color.hpp" #include "video/drawing_request.hpp" #include "video/font.hpp" diff --git a/src/video/renderer.hpp b/src/video/renderer.hpp index 5d4580798..20204e136 100644 --- a/src/video/renderer.hpp +++ b/src/video/renderer.hpp @@ -24,10 +24,10 @@ #include #include #include +#include #include "math/rect.hpp" #include "math/vector.hpp" -#include "obstack/obstack.h" #include "video/color.hpp" #include "video/font.hpp" #include "video/glutil.hpp" -- 2.11.0