diff options
| author | Max Horn | 2002-05-05 20:04:26 +0000 |
|---|---|---|
| committer | Max Horn | 2002-05-05 20:04:26 +0000 |
| commit | 2f2d4527efc63dffef87b2dd7826fde53a60897a (patch) | |
| tree | 37fa0c90810a8db394ea2188379588e2cbf54141 /gameDetector.cpp | |
| parent | 816fe7116872ca65603aaf49340e55c89410507b (diff) | |
| download | scummvm-rg350-2f2d4527efc63dffef87b2dd7826fde53a60897a.tar.gz scummvm-rg350-2f2d4527efc63dffef87b2dd7826fde53a60897a.tar.bz2 scummvm-rg350-2f2d4527efc63dffef87b2dd7826fde53a60897a.zip | |
cleaning up the mess drigo left... <sigh>
svn-id: r4215
Diffstat (limited to 'gameDetector.cpp')
| -rw-r--r-- | gameDetector.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gameDetector.cpp b/gameDetector.cpp index ddafb69f2e..cfb60d5410 100644 --- a/gameDetector.cpp +++ b/gameDetector.cpp @@ -23,13 +23,8 @@ #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" @@ -473,6 +468,8 @@ int GameDetector::detectMain(int argc, char **argv) _gfx_driver = GD_MORPHOS; #elif defined(_WIN32_WCE) _gfx_driver = GD_WINCE; +#elif defined(MACOS_CARBON) + _gfx_driver = GD_MAC; #else /* SDL is the default driver for now */ _gfx_driver = GD_SDL; @@ -542,6 +539,9 @@ OSystem *GameDetector::createSystem() { #elif defined(__MORPHOS__) case GD_MORPHOS: return OSystem_MorphOS_create(_gameId, _gfx_mode, _fullScreen); +#elif defined(MACOS_CARBON) + case GD_MAC: + return OSystem_MAC_create(_gfx_mode, _fullScreen); #elif defined(USE_NULL_DRIVER) case GD_NULL: return OSystem_NULL_create(); |