From 38a8aa516e0fa315e318801e5399f82e51efa8df Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat
Date: Tue, 6 May 2008 03:00:26 +0000
Subject: Allow static and dynamic plugins to be used at the same time

svn-id: r31888
---
 sound/mididrv.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sound/mididrv.cpp')

diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp
index 9108aa450b..53bc224180 100644
--- a/sound/mididrv.cpp
+++ b/sound/mididrv.cpp
@@ -68,7 +68,7 @@ static const MidiDriverDescription s_musicDrivers[] = {
 #if defined(PALMOS_MODE)
 #	if defined(COMPILE_CLIE)
 	{"ypa1", "Yamaha Pa1", MD_YPA1, MDT_MIDI},
-#	elif defined(COMPILE_ZODIAC) && (defined(DISABLE_SCUMM) || !defined(PALMOS_ARM))
+#	elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM))
 	{"zodiac", "Tapwave Zodiac", MD_ZODIAC, MDT_MIDI},
 #	endif
 #endif
@@ -239,7 +239,7 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) {
 #if defined(PALMOS_MODE)
 #if defined(COMPILE_CLIE)
 	case MD_YPA1:      return MidiDriver_YamahaPa1_create();
-#elif defined(COMPILE_ZODIAC) && (defined(DISABLE_SCUMM) || !defined(PALMOS_ARM))
+#elif defined(COMPILE_ZODIAC) && (!defined(ENABLE_SCUMM) || !defined(PALMOS_ARM))
 	case MD_ZODIAC:    return MidiDriver_Zodiac_create();
 #endif
 #endif
-- 
cgit v1.2.3