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

diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp
index c0fc5f1..232cfc0 100644 (file)
--- a/src/lisp/parser.cpp
+++ b/src/lisp/parser.cpp
@@ -16,6 +16,7 @@
 
 #include <sstream>
 #include <stdexcept>
+#include <tinygettext/tinygettext.hpp>
 
 #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 8d3927b..7bb9903 100644 (file)
--- 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 <obstack.h>
+
 #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 4435959..4672875 100644 (file)
--- a/src/supertux/globals.cpp
+++ b/src/supertux/globals.cpp
@@ -15,7 +15,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "supertux/globals.hpp"
-#include "tinygettext/tinygettext.hpp"
+#include <tinygettext/tinygettext.hpp>
 
 SDL_Surface* g_screen;
 JoystickKeyboardController* g_main_controller = 0;

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index bef5b08..57078c5 100644 (file)
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -22,6 +22,7 @@
 #include <SDL_image.h>
 #include <physfs.h>
 #include <iostream>
+#include <binreloc.h>
 
 #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 302b90e..e37d28b 100644 (file)
--- a/src/video/drawing_context.hpp
+++ b/src/video/drawing_context.hpp
@@ -20,12 +20,11 @@
 #include <memory>
 #include <string>
 #include <vector>
-
 #include <stdint.h>
+#include <obstack.h>
 
 #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 a96b4a8..ab1acbe 100644 (file)
--- 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 <SDL_video.h>
 #include <memory>
+#include <obstack.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
-#include <stdint.h>
-
-#include <SDL_video.h>
-
 #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 5d45807..20204e1 100644 (file)
--- a/src/video/renderer.hpp
+++ b/src/video/renderer.hpp
@@ -24,10 +24,10 @@
 #include <SDL_video.h>
 #include <assert.h>
 #include <stdint.h>
+#include <obstack.h>
 
 #include "math/rect.hpp"
 #include "math/vector.hpp"
-#include "obstack/obstack.h"
 #include "video/color.hpp"
 #include "video/font.hpp"
 #include "video/glutil.hpp"