diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /sound/mididrv.cpp | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'sound/mididrv.cpp')
| -rw-r--r-- | sound/mididrv.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |