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 | |
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')
-rw-r--r-- | src/being/compoundsprite.cpp | 6 | ||||
-rw-r--r-- | src/net/ea/network.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/messagein.cpp | 6 | ||||
-rw-r--r-- | src/net/eathena/messageout.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/messagein.cpp | 6 | ||||
-rw-r--r-- | src/net/tmwa/messageout.cpp | 2 | ||||
-rw-r--r-- | src/render/sdl2softwaregraphics.cpp | 2 | ||||
-rw-r--r-- | src/render/sdlgraphics.cpp | 2 | ||||
-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 |
17 files changed, 25 insertions, 41 deletions
diff --git a/src/being/compoundsprite.cpp b/src/being/compoundsprite.cpp index e1349e0ef..b41e6c0b5 100644 --- a/src/being/compoundsprite.cpp +++ b/src/being/compoundsprite.cpp @@ -48,14 +48,12 @@ #include "utils/timer.h" #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 - #ifndef USE_SDL2 static const int BUFFER_WIDTH = 100; static const int BUFFER_HEIGHT = 100; diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index 571fa2ebb..9a9fdba98 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -35,7 +35,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp index b32db3060..7cc1bd3a3 100644 --- a/src/net/eathena/messagein.cpp +++ b/src/net/eathena/messagein.cpp @@ -29,14 +29,12 @@ #include "utils/stringutils.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 - namespace EAthena { diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index 6cbcba027..66585cc58 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -30,7 +30,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp index 219466187..43c5b882f 100644 --- a/src/net/tmwa/messagein.cpp +++ b/src/net/tmwa/messagein.cpp @@ -29,14 +29,12 @@ #include "utils/stringutils.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 - namespace TmwAthena { diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index e0e7ffdb2..cc24d9f0d 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -30,7 +30,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index d60d70cc8..75effa3f9 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -39,7 +39,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index c0e9b58a3..3f146edba 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -38,7 +38,7 @@ #include "debug.h" -#ifndef SDL_BYTEORDER +#ifndef SDL_BIG_ENDIAN #error missing SDL_endian.h #endif // SDL_BYTEORDER 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() { |