diff options
| author | Enrico Rolfi | 2002-05-05 19:06:51 +0000 |
|---|---|---|
| committer | Enrico Rolfi | 2002-05-05 19:06:51 +0000 |
| commit | 38d048b86bd96796511a44b62b020ac6f6dfea3b (patch) | |
| tree | ee3fd5d3eafd3d240eacbdea0af8a33c5fe83f48 /gameDetector.cpp | |
| parent | 00f35bec5a387a2bd4dc983372245edb8e4a7c8f (diff) | |
| download | scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.tar.gz scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.tar.bz2 scummvm-rg350-38d048b86bd96796511a44b62b020ac6f6dfea3b.zip | |
Fixed some things for Macintosh ports
svn-id: r4212
Diffstat (limited to 'gameDetector.cpp')
| -rw-r--r-- | gameDetector.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp index 917e7ccff1..ddafb69f2e 100644 --- a/gameDetector.cpp +++ b/gameDetector.cpp @@ -23,8 +23,13 @@ #include "stdafx.h" #include "scumm.h" +#ifndef macintosh #include "sound/mididrv.h" #include "sound/imuse.h" +#else +#include "mididrv.h" +#include "imuse.h" +#endif #include "gameDetector.h" @@ -118,7 +123,7 @@ void GameDetector::updateconfig() void GameDetector::parseCommandLine(int argc, char **argv) { -#if !defined(__APPLE__CW) +#if !defined(MACOS_CARBON) int i; char *s; char *current_option = NULL; @@ -556,7 +561,7 @@ MidiDriver *GameDetector::createMidi() { #if defined (WIN32) && !defined(_WIN32_WCE) /* MD_WINDOWS is default MidiDriver on windows targets */ if (drv == MD_AUTO) drv = MD_WINDOWS; -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(macintosh) /* MD_QTMUSIC is default MidiDriver on MacOS targets */ if (drv == MD_AUTO) drv = MD_QTMUSIC; #endif @@ -573,8 +578,10 @@ MidiDriver *GameDetector::createMidi() { #if defined(UNIX) && !defined(__BEOS__) case MD_SEQ: return MidiDriver_SEQ_create(); #endif -#if defined(__APPLE__) +#if defined(__APPLE__) || defined(macintosh) case MD_QTMUSIC: return MidiDriver_QT_create(); +#endif +#if defined(__APPLE__) case MD_COREAUDIO: return MidiDriver_CORE_create(); #endif } |