diff options
| author | Max Horn | 2011-05-05 16:47:22 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-09 16:23:22 +0200 |
| commit | 49ab6d028984a582a9683e30d6e995c7efa3f804 (patch) | |
| tree | f7e1adefa5c5d048f5afbb6eb83fb60392b9711a /common | |
| parent | dfff22e56b4a62a2ec2e3e0564344597fd6605c6 (diff) | |
| download | scummvm-rg350-49ab6d028984a582a9683e30d6e995c7efa3f804.tar.gz scummvm-rg350-49ab6d028984a582a9683e30d6e995c7efa3f804.tar.bz2 scummvm-rg350-49ab6d028984a582a9683e30d6e995c7efa3f804.zip | |
COMMON: If config.h is present, don't use hardcoded settings from scummsys.h
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index b661aca198..55429fb847 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -116,6 +116,21 @@ #endif +// +// Define scumm_stricmp and scumm_strnicmp +// +#if defined(_WIN32_WCE) || defined(_MSC_VER) + #define scumm_stricmp stricmp + #define scumm_strnicmp _strnicmp +#elif defined(__MINGW32__) || defined(__GP32__) || defined(__DS__) + #define scumm_stricmp stricmp + #define scumm_strnicmp strnicmp +#else + #define scumm_stricmp strcasecmp + #define scumm_strnicmp strncasecmp +#endif + + // In the following we configure various targets, in particular those // which can't use our "configure" tool and hence don't use config.h. // @@ -134,26 +149,6 @@ // - ... // ... -// We define all types in config.h, so we don't want to typedef those types -// here again! -#ifdef HAVE_CONFIG_H -#define SCUMMVM_DONT_DEFINE_TYPES -#endif - -// -// Define scumm_stricmp and scumm_strnicmp -// -#if defined(_WIN32_WCE) || defined(_MSC_VER) - #define scumm_stricmp stricmp - #define scumm_strnicmp _strnicmp -#elif defined(__MINGW32__) || defined(__GP32__) || defined(__DS__) - #define scumm_stricmp stricmp - #define scumm_strnicmp strnicmp -#else - #define scumm_stricmp strcasecmp - #define scumm_strnicmp strncasecmp -#endif - // // By default we try to use pragma push/pop to ensure various structs we use @@ -169,7 +164,11 @@ #define SCUMMVM_USE_PRAGMA_PACK -#if defined(__SYMBIAN32__) +#if defined(HAVE_CONFIG_H) + // All settings should have been set in config.h + #define SCUMMVM_DONT_DEFINE_TYPES + +#elif defined(__SYMBIAN32__) #define SCUMM_LITTLE_ENDIAN #define SCUMM_NEED_ALIGNMENT |