From 0b48a71c9955b39117e2eb35b3e398f5c95c008a Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 17 Jul 2010 18:41:38 +0000 Subject: Remove PalmOS port svn-id: r50964 --- base/commandLine.cpp | 4 ++-- base/plugins.cpp | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'base') diff --git a/base/commandLine.cpp b/base/commandLine.cpp index e795b82d0a..2f4e78fd80 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -49,7 +49,7 @@ static const char USAGE_STRING[] = ; // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) +#if defined(__SYMBIAN32__) || defined(__GP32__) || defined(ANDROID) static const char HELP_STRING[] = "NoUsageString"; // save more data segment space #else static const char HELP_STRING[] = @@ -944,7 +944,7 @@ Common::Error processSettings(Common::String &command, Common::StringMap &settin // environment variable. This is weaker than a --savepath on the // command line, but overrides the default savepath, hence it is // handled here, just before the command line gets parsed. -#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) && !defined(__GP32__) && !defined(ANDROID) +#if !defined(_WIN32_WCE) && !defined(__GP32__) && !defined(ANDROID) if (!settings.contains("savepath")) { const char *dir = getenv("SCUMMVM_SAVEPATH"); if (dir && *dir && strlen(dir) < MAXPATHLEN) { diff --git a/base/plugins.cpp b/base/plugins.cpp index a6acd7e449..29383f1009 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -191,13 +191,6 @@ public: LINK_PLUGIN(COREAUDIO) LINK_PLUGIN(COREMIDI) #endif - #if defined(PALMOS_MODE) - # if defined(COMPILE_CLIE) - LINK_PLUGIN(YPA1) - # elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM)) - LINK_PLUGIN(ZODIAC) - # endif - #endif #ifdef USE_FLUIDSYNTH LINK_PLUGIN(FLUIDSYNTH) #endif -- cgit v1.2.3 From 211fcfe7bab49ceeb5e81f4dcb1be7e73c58d7c9 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 20 Jul 2010 08:24:34 +0000 Subject: MIDI: Build and use ALSA driver if and only if USE_ALSA is defined svn-id: r51053 --- base/plugins.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index 29383f1009..f23fbb48d8 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -172,7 +172,7 @@ public: #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) LINK_PLUGIN(WINDOWS) #endif - #if defined(UNIX) && defined(USE_ALSA) + #if defined(USE_ALSA) LINK_PLUGIN(ALSA) #endif #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__) && !defined(__ANDROID__) -- cgit v1.2.3 From 37aa8a7499e6aa1698beb7e241c42ba19475a83a Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 20 Jul 2010 08:25:13 +0000 Subject: BUILD: Unify adding -DUNIX to DEFINES; complete SEQ MIDI detection * Added a yes/no variable _unix to configure, which controls when -DUNIX is added to DEFINES * Enable SEQ MIDI via _seq_midi by default on UNIX type systems, except for those which override that. * Switch SEQ MIDI code to check #define USE_SEQ_MIDI (alternatively, we could compile it only conditionally...) svn-id: r51055 --- base/plugins.cpp | 2 +- base/version.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'base') diff --git a/base/plugins.cpp b/base/plugins.cpp index f23fbb48d8..5d0be11065 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -175,7 +175,7 @@ public: #if defined(USE_ALSA) LINK_PLUGIN(ALSA) #endif - #if defined(UNIX) && !defined(__BEOS__) && !defined(__MAEMO__) && !defined(__MINT__) && !defined(__ANDROID__) + #if defined(USE_SEQ_MIDI) LINK_PLUGIN(SEQ) #endif #if defined(__MINT__) diff --git a/base/version.cpp b/base/version.cpp index ad74c64265..0e7f62f80f 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -86,6 +86,10 @@ const char *gScummVMFeatures = "" "ALSA " #endif +#ifdef USE_ALSA + "SEQ " +#endif + #ifdef USE_RGB_COLOR "RGB " #endif -- cgit v1.2.3 From 5b3f31feec43db358c1ad9bb38a7e602b5a90bb0 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Tue, 20 Jul 2010 08:56:53 +0000 Subject: General: Fixed building the SEQ MIDI driver An #include was missing, causing the driver to never be built. Also fixed what looked like a cut-and-paste error in generating the features string. svn-id: r51056 --- base/version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/version.cpp b/base/version.cpp index 0e7f62f80f..17058d4a03 100644 --- a/base/version.cpp +++ b/base/version.cpp @@ -86,7 +86,7 @@ const char *gScummVMFeatures = "" "ALSA " #endif -#ifdef USE_ALSA +#ifdef USE_SEQ_MIDI "SEQ " #endif -- cgit v1.2.3 From 02a2f084080ba92f85e937dac5618bbda19e4ec4 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Mon, 26 Jul 2010 06:10:47 +0000 Subject: Janitorial: Fix punctuation in error/warning svn-id: r51296 --- base/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/main.cpp b/base/main.cpp index d40c912bf8..e651456ace 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -347,7 +347,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) { // On the other hand we cannot load the plugins before we know the file paths (in case of external plugins). if (settings.contains("music-driver")) { if (MidiDriver::getMusicType(MidiDriver::getDeviceHandle(settings["music-driver"])) == MT_INVALID) { - warning("Unrecognized music driver '%s'. Switching to default device.", settings["music-driver"].c_str()); + warning("Unrecognized music driver '%s'. Switching to default device", settings["music-driver"].c_str()); settings["music-driver"] = "auto"; } } -- cgit v1.2.3