aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2010-07-20 08:25:13 +0000
committerMax Horn2010-07-20 08:25:13 +0000
commit37aa8a7499e6aa1698beb7e241c42ba19475a83a (patch)
tree459fb3d2eb5482141ef233e676ca55cf10b5978e /base
parente527ad162f3fb69508947f7229d7b98f8aceafed (diff)
downloadscummvm-rg350-37aa8a7499e6aa1698beb7e241c42ba19475a83a.tar.gz
scummvm-rg350-37aa8a7499e6aa1698beb7e241c42ba19475a83a.tar.bz2
scummvm-rg350-37aa8a7499e6aa1698beb7e241c42ba19475a83a.zip
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
Diffstat (limited to 'base')
-rw-r--r--base/plugins.cpp2
-rw-r--r--base/version.cpp4
2 files changed, 5 insertions, 1 deletions
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