thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some things for Macintosh ports

Browse source 
svn-id: r4212
This commit is contained in:
Enrico Rolfi 2002-05-05 19:06:51 +00:00
parent 00f35bec5a
commit 38d048b86b
12 changed files with 71 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gameDetector.cpp
View file

@ -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
}