From d53b058ec3f6208f34884ed572bb5d47de932108 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 31 May 2016 01:48:18 +0300
Subject: Fix different include issues.

---
 src/resources/atlas/atlasmanager.cpp              | 4 ++++
 src/resources/dye/dye.cpp                         | 4 ++++
 src/resources/dye/dyepalette.cpp                  | 4 ++++
 src/resources/imagehelper.cpp                     | 4 ++++
 src/resources/openglimagehelper.cpp               | 4 ++++
 src/resources/resourcemanager/resourcemanager.cpp | 1 -
 src/resources/safeopenglimagehelper.cpp           | 4 ++++
 src/resources/sdl2softwarescreenshothelper.cpp    | 4 ++++
 src/resources/sdlimagehelper.cpp                  | 4 ++++
 src/resources/sdlscreenshothelper.cpp             | 4 ++++
 src/resources/sprite/spritedisplay.h              | 2 ++
 src/resources/updatefile.h                        | 2 ++
 12 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'src/resources')

diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp
index 46f161e6a..4e1b0e96c 100644
--- a/src/resources/atlas/atlasmanager.cpp
+++ b/src/resources/atlas/atlasmanager.cpp
@@ -46,6 +46,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 AtlasManager::AtlasManager()
 {
 }
diff --git a/src/resources/dye/dye.cpp b/src/resources/dye/dye.cpp
index a5dd44221..3aa42d7e7 100644
--- a/src/resources/dye/dye.cpp
+++ b/src/resources/dye/dye.cpp
@@ -34,6 +34,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 Dye::Dye(const std::string &restrict description)
 {
     for (int i = 0; i < dyePalateSize; ++i)
diff --git a/src/resources/dye/dyepalette.cpp b/src/resources/dye/dyepalette.cpp
index 5884554ed..930f23723 100644
--- a/src/resources/dye/dyepalette.cpp
+++ b/src/resources/dye/dyepalette.cpp
@@ -36,6 +36,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 DyePalette::DyePalette(const std::string &restrict description,
                        const uint8_t blockSize) :
     mColors()
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index 1067058b2..737e43aaa 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -33,6 +33,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 ImageHelper *imageHelper = nullptr;
 ImageHelper *surfaceImageHelper = nullptr;
 
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 9e3e5dc2d..7ce48556d 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -50,6 +50,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 int OpenGLImageHelper::mTextureType = 0;
 int OpenGLImageHelper::mInternalTextureType = GL_RGBA8;
 int OpenGLImageHelper::mTextureSize = 0;
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index e2aa08baa..993d011b7 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -38,7 +38,6 @@
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/physfsrwops.h"
-#include "utils/physfstools.h"
 
 #ifdef USE_OPENGL
 #include "render/shaders/shader.h"
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index c57e2a104..8a929f214 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -47,6 +47,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 int SafeOpenGLImageHelper::mTextureType = 0;
 int SafeOpenGLImageHelper::mInternalTextureType = GL_RGBA8;
 int SafeOpenGLImageHelper::mTextureSize = 0;
diff --git a/src/resources/sdl2softwarescreenshothelper.cpp b/src/resources/sdl2softwarescreenshothelper.cpp
index 45e784385..9b76c9472 100644
--- a/src/resources/sdl2softwarescreenshothelper.cpp
+++ b/src/resources/sdl2softwarescreenshothelper.cpp
@@ -33,6 +33,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 Sdl2SoftwareScreenshotHelper::Sdl2SoftwareScreenshotHelper() :
     ScreenshotHelper()
 {
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index ad046221f..d97a51fc6 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -39,6 +39,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 bool SDLImageHelper::mEnableAlphaCache = false;
 
 Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye)
diff --git a/src/resources/sdlscreenshothelper.cpp b/src/resources/sdlscreenshothelper.cpp
index dd4689f08..a7375d919 100644
--- a/src/resources/sdlscreenshothelper.cpp
+++ b/src/resources/sdlscreenshothelper.cpp
@@ -30,6 +30,10 @@
 
 #include "debug.h"
 
+#ifndef SDL_BYTEORDER
+#error missing SDL_endian.h
+#endif
+
 SdlScreenshotHelper::SdlScreenshotHelper() :
     ScreenshotHelper()
 {
diff --git a/src/resources/sprite/spritedisplay.h b/src/resources/sprite/spritedisplay.h
index 424e8adc2..931c6a532 100644
--- a/src/resources/sprite/spritedisplay.h
+++ b/src/resources/sprite/spritedisplay.h
@@ -25,6 +25,8 @@
 
 #include "utils/stringvector.h"
 
+#include "localconsts.h"
+
 struct SpriteReference;
 
 struct SpriteDisplay final
diff --git a/src/resources/updatefile.h b/src/resources/updatefile.h
index a92ec8e84..27e89fe9d 100644
--- a/src/resources/updatefile.h
+++ b/src/resources/updatefile.h
@@ -23,6 +23,8 @@
 #ifndef RESOURCES_UPDATEFILE_H
 #define RESOURCES_UPDATEFILE_H
 
+#include "localconsts.h"
+
 #include <string>
 
 struct UpdateFile final
-- 
cgit v1.2.3-70-g09d2