diff options
| -rw-r--r-- | audio/softsynth/opl/mame.cpp | 4 | ||||
| -rw-r--r-- | backends/events/symbiansdl/symbiansdl-events.cpp | 3 | ||||
| -rw-r--r-- | base/commandLine.cpp | 4 | ||||
| -rw-r--r-- | common/scummsys.h | 1 | ||||
| -rw-r--r-- | gui/options.cpp | 4 |
5 files changed, 7 insertions, 9 deletions
diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp index cba95422fc..0903f335cf 100644 --- a/audio/softsynth/opl/mame.cpp +++ b/audio/softsynth/opl/mame.cpp @@ -40,7 +40,7 @@ #include "common/textconsole.h" #include "common/util.h" -#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__) +#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__) #include "common/config-manager.h" #endif @@ -1233,7 +1233,7 @@ FM_OPL *makeAdLibOPL(int rate) { // We need to emulate one YM3812 chip int env_bits = FMOPL_ENV_BITS_HQ; int eg_ent = FMOPL_EG_ENT_HQ; -#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__) +#if defined(_WIN32_WCE) || defined(__SYMBIAN32__) || defined(GP2X) || defined(__MAEMO__) || defined(__DS__) || defined(__MINT__) || defined(__N64__) if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) { env_bits = FMOPL_ENV_BITS_HQ; eg_ent = FMOPL_EG_ENT_HQ; diff --git a/backends/events/symbiansdl/symbiansdl-events.cpp b/backends/events/symbiansdl/symbiansdl-events.cpp index fde748f444..d4d8cf2bb1 100644 --- a/backends/events/symbiansdl/symbiansdl-events.cpp +++ b/backends/events/symbiansdl/symbiansdl-events.cpp @@ -169,8 +169,7 @@ bool SymbianSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) { ev.key.keysym.mod = (SDLMod) key.flags(); // Translate from SDL keymod event to Scummvm Key Mod Common::Event. - // This codes is also present in GP32 backend and in SDL backend as a static function - // Perhaps it should be shared. + // TODO: Make use of SdlEventSource::SDLModToOSystemKeyFlags? if (key.flags() != 0) { event.kbd.flags = 0; diff --git a/base/commandLine.cpp b/base/commandLine.cpp index a54f444b6f..3019998f09 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -58,7 +58,7 @@ static const char USAGE_STRING[] = ; // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) || defined(__DS__) || defined(__3DS__) +#if defined(__SYMBIAN32__) || defined(ANDROID) || defined(__DS__) || defined(__3DS__) static const char HELP_STRING[] = "NoUsageString"; // save more data segment space #else static const char HELP_STRING[] = @@ -191,7 +191,7 @@ static void usage(const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); va_end(va); -#if !(defined(__GP32__) || defined(__SYMBIAN32__) || defined(__DS__)) +#if !(defined(__SYMBIAN32__) || defined(__DS__)) printf(USAGE_STRING, s_appName, buf, s_appName, s_appName); #endif exit(1); diff --git a/common/scummsys.h b/common/scummsys.h index ce54f3b50e..343dc9a5eb 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -284,7 +284,6 @@ #if defined(__DC__) || \ defined(__DS__) || \ defined(__3DS__) || \ - defined(__GP32__) || \ defined(IPHONE) || \ defined(__PLAYSTATION2__) || \ defined(__PSP__) || \ diff --git a/gui/options.cpp b/gui/options.cpp index efaacc955e..7c1a576c57 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1585,7 +1585,7 @@ void GlobalOptionsDialog::build() { else _pathsTabId = tab->addTab(_c("Paths", "lowres")); -#if !( defined(__DC__) || defined(__GP32__) ) +#if !defined(__DC__) // These two buttons have to be extra wide, or the text will be // truncated in the small version of the GUI. @@ -1786,7 +1786,7 @@ void GlobalOptionsDialog::build() { OptionsDialog::build(); -#if !( defined(__DC__) || defined(__GP32__) ) +#if !defined(__DC__) // Set _savePath to the current save path Common::String savePath(ConfMan.get("savepath", _domain)); Common::String themePath(ConfMan.get("themepath", _domain)); |