diff options
| author | Max Horn | 2004-03-07 03:28:01 +0000 |
|---|---|---|
| committer | Max Horn | 2004-03-07 03:28:01 +0000 |
| commit | a6725902594145cb0d1ecf3b3da764c92d1542db (patch) | |
| tree | fbd147e1a48bb4dc0c09f036db52805d884f7b65 /common/scummsys.h | |
| parent | 452a3e2a10dc4a7e9174f9b62fa3c128d3520404 (diff) | |
| download | scummvm-rg350-a6725902594145cb0d1ecf3b3da764c92d1542db.tar.gz scummvm-rg350-a6725902594145cb0d1ecf3b3da764c92d1542db.tar.bz2 scummvm-rg350-a6725902594145cb0d1ecf3b3da764c92d1542db.zip | |
remove dependency on SDL_byteorder.h when we are using config.h
svn-id: r13206
Diffstat (limited to 'common/scummsys.h')
| -rw-r--r-- | common/scummsys.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 7eb1fb639b..383dbd9e49 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -106,22 +106,24 @@ #define CHECK_HEAP - #ifdef X11_BACKEND - - // You need to set this manually if necessary -// #define SCUMM_LITTLE_ENDIAN + #ifndef CONFIG_H + #ifdef X11_BACKEND - #else - /* need this for the SDL_BYTEORDER define */ - #include <SDL_byteorder.h> - - #if SDL_BYTEORDER == SDL_LIL_ENDIAN - #define SCUMM_LITTLE_ENDIAN - #elif SDL_BYTEORDER == SDL_BIG_ENDIAN - #define SCUMM_BIG_ENDIAN - #else - #error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set. - #endif + // You need to set this manually if necessary + // #define SCUMM_LITTLE_ENDIAN + + #else + /* need this for the SDL_BYTEORDER define */ + #include <SDL_byteorder.h> + + #if SDL_BYTEORDER == SDL_LIL_ENDIAN + #define SCUMM_LITTLE_ENDIAN + #elif SDL_BYTEORDER == SDL_BIG_ENDIAN + #define SCUMM_BIG_ENDIAN + #else + #error Neither SDL_BIG_ENDIAN nor SDL_LITTLE_ENDIAN is set. + #endif + #endif #endif // You need to set this manually if necessary |