diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-09-16 16:17:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-09-16 16:17:10 +0300 |
commit | ba9fac97eb0afba27e7d35bef34255c8ac436295 (patch) | |
tree | c17598a7df4f8a61a61cf53a753cfaa938aeb23e /src | |
parent | 28658bf384121e2522c95e9a2e1c1d7530f0fcd7 (diff) | |
download | mv-ba9fac97eb0afba27e7d35bef34255c8ac436295.tar.gz mv-ba9fac97eb0afba27e7d35bef34255c8ac436295.tar.bz2 mv-ba9fac97eb0afba27e7d35bef34255c8ac436295.tar.xz mv-ba9fac97eb0afba27e7d35bef34255c8ac436295.zip |
fix compilation with SDL2.
Diffstat (limited to 'src')
-rw-r--r-- | src/render/graphics.h | 4 | ||||
-rw-r--r-- | src/render/sdl2softwaregraphics.cpp | 2 | ||||
-rw-r--r-- | src/resources/image.h | 4 | ||||
-rw-r--r-- | src/utils/copynpaste.cpp | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/src/render/graphics.h b/src/render/graphics.h index aad3c2bed..12df83aef 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -32,6 +32,10 @@ #include <guichan/color.hpp> #include <guichan/graphics.hpp> +#ifdef USE_SDL2 +#include <SDL_render.h> +#endif + #include "localconsts.h" class Image; diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index c60961a40..5ba4ab693 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -36,6 +36,8 @@ #include "utils/sdlcheckutils.h" +#include <guichan/sdl/sdlpixel.hpp> + #include "debug.h" #if SDL_BYTEORDER == SDL_LIL_ENDIAN diff --git a/src/resources/image.h b/src/resources/image.h index 1f8e2b4b6..0369bff2c 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -42,6 +42,10 @@ #endif #endif +#ifdef USE_SDL2 +#include <SDL_render.h> +#endif + #include <map> /** diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 134f7ba1b..20af28454 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -44,6 +44,8 @@ #include "debug.h" #ifdef USE_SDL2 +#include <SDL_clipboard.h> + bool retrieveBuffer(std::string& text, size_t& pos) { char *buf = SDL_GetClipboardText(); |