summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-06 17:58:07 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-06 17:58:07 +0300
commit4f7e38d218848bd34bd86dda75446881dad2bb32 (patch)
tree3333e686b0d0a579b8151fac0d0faa235f4e145b /src
parentc649cf883480071c9b93909c4ea4ee5ec98155b2 (diff)
downloadplus-4f7e38d218848bd34bd86dda75446881dad2bb32.tar.gz
plus-4f7e38d218848bd34bd86dda75446881dad2bb32.tar.bz2
plus-4f7e38d218848bd34bd86dda75446881dad2bb32.tar.xz
plus-4f7e38d218848bd34bd86dda75446881dad2bb32.zip
Fix compilation with some options.
Diffstat (limited to 'src')
-rw-r--r--src/resources/sdl2imagehelper.cpp2
-rw-r--r--src/resources/sdl2imagehelper.h2
-rw-r--r--src/resources/surfaceimagehelper.cpp4
-rw-r--r--src/resources/surfaceimagehelper.h4
-rw-r--r--src/utils/gettexthelper.cpp2
5 files changed, 8 insertions, 6 deletions
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index e9d0f11e9..c671a60c1 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -52,7 +52,7 @@ Image *SDLImageHelper::load(SDL_Surface *const tmpImage)
Image *SDLImageHelper::createTextSurface(SDL_Surface *const tmpImage,
const int width A_UNUSED,
const int height A_UNUSED,
- const float alpha) const
+ const float alpha)
{
if (!tmpImage)
return nullptr;
diff --git a/src/resources/sdl2imagehelper.h b/src/resources/sdl2imagehelper.h
index 0ffeee7ae..e7ddc2987 100644
--- a/src/resources/sdl2imagehelper.h
+++ b/src/resources/sdl2imagehelper.h
@@ -60,7 +60,7 @@ class SDLImageHelper final : public ImageHelper
Image *createTextSurface(SDL_Surface *const tmpImage,
const int width, const int height,
const float alpha)
- const override final A_WARN_UNUSED;
+ override final A_WARN_UNUSED;
static void SDLSetEnableAlphaCache(const bool n)
{ mEnableAlphaCache = n; }
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index ec7d9af9b..158cad94b 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -40,7 +40,7 @@
bool SurfaceImageHelper::mEnableAlphaCache = false;
-Image *SurfaceImageHelper::load(SDL_Surface *const tmpImage) const
+Image *SurfaceImageHelper::load(SDL_Surface *const tmpImage)
{
return _SDLload(tmpImage);
}
@@ -48,7 +48,7 @@ Image *SurfaceImageHelper::load(SDL_Surface *const tmpImage) const
Image *SurfaceImageHelper::createTextSurface(SDL_Surface *const tmpImage,
const int width A_UNUSED,
const int height A_UNUSED,
- const float alpha) const
+ const float alpha)
{
if (!tmpImage)
return nullptr;
diff --git a/src/resources/surfaceimagehelper.h b/src/resources/surfaceimagehelper.h
index 3e595009e..dd8e416cb 100644
--- a/src/resources/surfaceimagehelper.h
+++ b/src/resources/surfaceimagehelper.h
@@ -56,13 +56,13 @@ class SurfaceImageHelper final : public ImageHelper
/**
* Loads an image from an SDL surface.
*/
- Image *load(SDL_Surface *const tmpImage) const
+ Image *load(SDL_Surface *const tmpImage)
override final A_WARN_UNUSED;
Image *createTextSurface(SDL_Surface *const tmpImage,
const int width, const int height,
const float alpha)
- const override final A_WARN_UNUSED;
+ override final A_WARN_UNUSED;
static void SDLSetEnableAlphaCache(const bool n)
{ mEnableAlphaCache = n; }
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 8636acb34..1e2fffef7 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -29,6 +29,8 @@
#include <libintl.h>
#endif
+#include "utils/physfstools.h"
+
#ifdef WIN32
#include <string>
extern "C" char const *_nl_locale_name_default(void);