diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-06-15 19:00:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-06-15 19:00:59 +0300 |
| commit | 39e19833f3cdb67b53544f3a8787628e484a50ef (patch) | |
| tree | 20758d2591927e2147d343cf44b8ef39cd8045c5 /src/resources | |
| parent | 5273b0bc8dcc2adbf8557a4008c63e50955884fe (diff) | |
| download | plus-39e19833f3cdb67b53544f3a8787628e484a50ef.tar.gz plus-39e19833f3cdb67b53544f3a8787628e484a50ef.tar.bz2 plus-39e19833f3cdb67b53544f3a8787628e484a50ef.tar.xz plus-39e19833f3cdb67b53544f3a8787628e484a50ef.zip | |
Fix other include issues.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/image/image.h | 6 | ||||
| -rw-r--r-- | src/resources/map/map.cpp | 2 | ||||
| -rw-r--r-- | src/resources/map/maplayer.cpp | 4 | ||||
| -rw-r--r-- | src/resources/sdl2softwareimagehelper.h | 2 | ||||
| -rw-r--r-- | src/resources/sdlimagehelper.h | 1 | ||||
| -rw-r--r-- | src/resources/surfaceimagehelper.h | 2 |
6 files changed, 6 insertions, 11 deletions
diff --git a/src/resources/image/image.h b/src/resources/image/image.h index 39492c360..ae29a66ae 100644 --- a/src/resources/image/image.h +++ b/src/resources/image/image.h @@ -29,8 +29,6 @@ #include "resources/resource.h" -#include <SDL_video.h> - #ifdef USE_OPENGL #ifdef ANDROID @@ -45,7 +43,9 @@ #ifdef USE_SDL2 #include <SDL_render.h> -#endif +#else // USE_SDL2 +#include <SDL_video.h> +#endif // USE_SDL2 #include <map> diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index e86c0c2a4..e0454ea8c 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -69,7 +69,9 @@ #include <sys/stat.h> +#ifdef ENABLE_PUGIXML #include <climits> +#endif // ENABLE_LIBXML #include "debug.h" diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index ba8f49455..f71f1de48 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -24,10 +24,6 @@ #include "configuration.h" -#ifndef USE_OPENGL -#include "render/graphics.h" -#endif - #include "being/localplayer.h" #include "enums/resources/map/blockmask.h" diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h index a62937bf7..0160a5660 100644 --- a/src/resources/sdl2softwareimagehelper.h +++ b/src/resources/sdl2softwareimagehelper.h @@ -29,8 +29,6 @@ #include "resources/imagehelper.h" -#include <SDL.h> - class Dye; class Image; diff --git a/src/resources/sdlimagehelper.h b/src/resources/sdlimagehelper.h index 4e1f37a7b..347a8b585 100644 --- a/src/resources/sdlimagehelper.h +++ b/src/resources/sdlimagehelper.h @@ -25,6 +25,7 @@ #ifdef USE_SDL2 #include "resources/sdl2imagehelper.h" +RESOURCES_SDL2IMAGEHELPER_H #else diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h index 6100b3437..15c8d66d2 100644 --- a/src/resources/surfaceimagehelper.h +++ b/src/resources/surfaceimagehelper.h @@ -33,8 +33,6 @@ RESOURCES_SDLIMAGEHELPER_H #include "resources/imagehelper.h" -#include <SDL.h> - class Dye; class Image; |