diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-06-03 18:58:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-06-03 18:58:01 +0300 |
| commit | 45da7f72b07817afebdf46fcfbb70352fe3a2b5a (patch) | |
| tree | 0cc03f715fa1b4badd4e32b62142c82c0614e32e | |
| parent | d3e2725ac3f8832bc34b879286d31b631f8069c9 (diff) | |
| download | manaverse-45da7f72b07817afebdf46fcfbb70352fe3a2b5a.tar.gz manaverse-45da7f72b07817afebdf46fcfbb70352fe3a2b5a.tar.bz2 manaverse-45da7f72b07817afebdf46fcfbb70352fe3a2b5a.tar.xz manaverse-45da7f72b07817afebdf46fcfbb70352fe3a2b5a.zip | |
Fix wrong includes.
| -rw-r--r-- | src/debug/debug_new.cpp | 2 | ||||
| -rw-r--r-- | src/graphicsmanager.cpp | 2 | ||||
| -rw-r--r-- | src/render/graphics.h | 4 | ||||
| -rw-r--r-- | src/resources/sdlimagehelper.h | 2 | ||||
| -rw-r--r-- | src/sdl2gfx/SDL2_framerate.h | 2 | ||||
| -rw-r--r-- | src/sdl2gfx/SDL2_rotozoom.h | 2 | ||||
| -rw-r--r-- | src/utils/sdlpixel.h | 2 | ||||
| -rw-r--r-- | src/utils/timer.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/debug/debug_new.cpp b/src/debug/debug_new.cpp index 4c133c1ac..d0030c685 100644 --- a/src/debug/debug_new.cpp +++ b/src/debug/debug_new.cpp @@ -194,7 +194,7 @@ * is defined to \c 0 to disable the redefinition of \c new. */ #define M_DEBUG_NEW_REDEFINE_NEW 0 -#include "debug_new.h" +#include "debug/debug_new.h" /** * Gets the aligned value of memory block size. diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index e31ec36ea..66e352c2b 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -31,7 +31,7 @@ #include <SDL_android.h> #endif #else -#include "GL/glx.h" +#include <GL/glx.h> #endif #else #endif diff --git a/src/render/graphics.h b/src/render/graphics.h index d716226df..08bb7facf 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -66,8 +66,6 @@ #ifndef RENDER_GRAPHICS_H #define RENDER_GRAPHICS_H -#include "SDL_video.h" - #include "sdlshared.h" #include "gui/color.h" @@ -76,6 +74,8 @@ #include "render/rendertype.h" +#include <SDL_video.h> + #ifdef USE_SDL2 #include <SDL_render.h> #endif diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 42433ec55..18228c2e9 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -24,7 +24,7 @@ #define RESOURCES_SDLIMAGEHELPER_H #ifdef USE_SDL2 -#include "sdl2imagehelper.h" +#include "resources/sdl2imagehelper.h" #else diff --git a/src/sdl2gfx/SDL2_framerate.h b/src/sdl2gfx/SDL2_framerate.h index a2e62e944..1f5a70c85 100644 --- a/src/sdl2gfx/SDL2_framerate.h +++ b/src/sdl2gfx/SDL2_framerate.h @@ -37,7 +37,7 @@ extern "C" { /* --- */ -#include "SDL.h" +#include <SDL.h> /* --------- Definitions */ diff --git a/src/sdl2gfx/SDL2_rotozoom.h b/src/sdl2gfx/SDL2_rotozoom.h index f4c236ba4..72dde24a5 100644 --- a/src/sdl2gfx/SDL2_rotozoom.h +++ b/src/sdl2gfx/SDL2_rotozoom.h @@ -41,7 +41,7 @@ extern "C" { #define M_PI 3.1415926535897932384626433832795 #endif -#include "SDL.h" +#include <SDL.h> /* ---- Defines */ diff --git a/src/utils/sdlpixel.h b/src/utils/sdlpixel.h index 5152a68c2..7b8d9b3cb 100644 --- a/src/utils/sdlpixel.h +++ b/src/utils/sdlpixel.h @@ -66,7 +66,7 @@ #include "gui/color.h" -#include "SDL.h" +#include <SDL.h> /** * Puts a pixel on an SDL_Surface. diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp index f5245646e..e82362126 100644 --- a/src/utils/timer.cpp +++ b/src/utils/timer.cpp @@ -20,7 +20,7 @@ #include "utils/timer.h" -#include "SDL_timer.h" +#include <SDL_timer.h> #include <climits> |