diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-11-04 23:51:03 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-11-04 23:51:03 +0300 |
commit | a634b3c1ca521c79f5f1d5412e68c73e18a39526 (patch) | |
tree | 2ce2d61c028b1d230780505fe1a05ad2d430efd8 /src/resources | |
parent | 165eef78d8860585fcde8f1e7b128723c240777d (diff) | |
download | manaplus-a634b3c1ca521c79f5f1d5412e68c73e18a39526.tar.gz manaplus-a634b3c1ca521c79f5f1d5412e68c73e18a39526.tar.bz2 manaplus-a634b3c1ca521c79f5f1d5412e68c73e18a39526.tar.xz manaplus-a634b3c1ca521c79f5f1d5412e68c73e18a39526.zip |
Fix some defines/includes, because in some systems it may works wrong.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 6 | ||||
-rw-r--r-- | src/resources/dye/dye.cpp | 6 | ||||
-rw-r--r-- | src/resources/dye/dyepalette.cpp | 6 | ||||
-rw-r--r-- | src/resources/imagehelper.cpp | 2 | ||||
-rw-r--r-- | src/resources/openglimagehelper.cpp | 2 | ||||
-rw-r--r-- | src/resources/safeopenglimagehelper.cpp | 2 | ||||
-rw-r--r-- | src/resources/sdl2softwarescreenshothelper.cpp | 6 | ||||
-rw-r--r-- | src/resources/sdlimagehelper.cpp | 2 | ||||
-rw-r--r-- | src/resources/sdlscreenshothelper.cpp | 6 |
9 files changed, 14 insertions, 24 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index b097bcfc4..abcec0225 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -42,16 +42,14 @@ #include "resources/resourcemanager/resourcemanager.h" +#ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> +#endif // SDL_BYTEORDER #include "utils/checkutils.h" #include "debug.h" -#ifndef SDL_BYTEORDER -#error missing SDL_endian.h -#endif // SDL_BYTEORDER - AtlasManager::AtlasManager() { } diff --git a/src/resources/dye/dye.cpp b/src/resources/dye/dye.cpp index e37b2e943..eac52f638 100644 --- a/src/resources/dye/dye.cpp +++ b/src/resources/dye/dye.cpp @@ -30,14 +30,12 @@ #include <sstream> +#ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> +#endif // SDL_BYTEORDER #include "debug.h" -#ifndef SDL_BYTEORDER -#error missing SDL_endian.h -#endif // SDL_BYTEORDER - 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 9ea08331d..b2b2d9832 100644 --- a/src/resources/dye/dyepalette.cpp +++ b/src/resources/dye/dyepalette.cpp @@ -34,14 +34,12 @@ #include <cmath> #endif // USE_SDL2 +#ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> +#endif // SDL_BYTEORDER #include "debug.h" -#ifndef SDL_BYTEORDER -#error missing SDL_endian.h -#endif // SDL_BYTEORDER - 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 78afafcd7..11deded0a 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -33,7 +33,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 7925e7faa..06c40388b 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -50,7 +50,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp index b1daf05e9..d83c1b711 100644 --- a/src/resources/safeopenglimagehelper.cpp +++ b/src/resources/safeopenglimagehelper.cpp @@ -46,7 +46,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/resources/sdl2softwarescreenshothelper.cpp b/src/resources/sdl2softwarescreenshothelper.cpp index af9982fa1..4e57d21d2 100644 --- a/src/resources/sdl2softwarescreenshothelper.cpp +++ b/src/resources/sdl2softwarescreenshothelper.cpp @@ -28,14 +28,12 @@ #include "utils/sdlcheckutils.h" +#ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> +#endif // SDL_BYTEORDER #include "debug.h" -#ifndef SDL_BYTEORDER -#error missing SDL_endian.h -#endif // SDL_BYTEORDER - Sdl2SoftwareScreenshotHelper::Sdl2SoftwareScreenshotHelper() : ScreenshotHelper() { diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index de2c0a62a..fc5251d1c 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -37,7 +37,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/resources/sdlscreenshothelper.cpp b/src/resources/sdlscreenshothelper.cpp index 5062be44d..831875322 100644 --- a/src/resources/sdlscreenshothelper.cpp +++ b/src/resources/sdlscreenshothelper.cpp @@ -26,14 +26,12 @@ #include "utils/sdlcheckutils.h" +#ifndef SDL_BIG_ENDIAN #include <SDL_endian.h> +#endif // SDL_BYTEORDER #include "debug.h" -#ifndef SDL_BYTEORDER -#error missing SDL_endian.h -#endif // SDL_BYTEORDER - SdlScreenshotHelper::SdlScreenshotHelper() : ScreenshotHelper() { |