diff options
| author | Lars Persson | 2005-06-21 22:08:21 +0000 |
|---|---|---|
| committer | Lars Persson | 2005-06-21 22:08:21 +0000 |
| commit | 1c69696a9a8878971c4fa925b074498dab757857 (patch) | |
| tree | d8f4f2cfea1a3e01bb7f5f5c58fb812d8029ca96 /sound | |
| parent | 4564f0d3bf0d40f5a2ca125df0682969adc8431c (diff) | |
| download | scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.tar.gz scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.tar.bz2 scummvm-rg350-1c69696a9a8878971c4fa925b074498dab757857.zip | |
Patches needed to build for SYMBIAN32 WINS/GCC added.
Test built for Symbian and run on P910i without any major problems.
Test built for MSVC6. Changed parts seems to compile ok but there are some problems with MSVC6 and some of the targets which the EPOC build does n't support (KYRA,SAGA).
svn-id: r18430
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/fmopl.cpp | 4 | ||||
| -rw-r--r-- | sound/mididrv.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/fmopl.cpp b/sound/fmopl.cpp index 1ebe1b0348..40a73e465e 100644 --- a/sound/fmopl.cpp +++ b/sound/fmopl.cpp @@ -34,7 +34,7 @@ #include "common/util.h" -#ifdef _WIN32_WCE +#if defined (_WIN32_WCE)|| defined (__SYMBIAN32__) #include "common/config-manager.h" #endif @@ -1167,7 +1167,7 @@ FM_OPL *makeAdlibOPL(int rate) { // We need to emulate one YM3812 chip int env_bits = FMOPL_ENV_BITS_HQ; int eg_ent = FMOPL_EG_ENT_HQ; -#ifdef _WIN32_WCE +#if defined (_WIN32_WCE)|| defined(__SYMBIAN32__) if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) { env_bits = FMOPL_ENV_BITS_HQ; eg_ent = FMOPL_EG_ENT_HQ; diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 424ed915e8..35da9cb015 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -33,7 +33,7 @@ static const struct MidiDriverDescription midiDrivers[] = { {"auto", "Default", MD_AUTO}, {"null", "No music", MD_NULL}, -#if defined(WIN32) && !defined(_WIN32_WCE) +#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) {"windows", "Windows MIDI", MD_WINDOWS}, #endif @@ -126,7 +126,7 @@ int MidiDriver::detectMusicDriver(int midiFlags) { if (musicDriver == MD_AUTO || musicDriver < 0) { if (midiFlags & MDT_PREFER_NATIVE) { if (musicDriver == MD_AUTO) { - #if defined(WIN32) && !defined(_WIN32_WCE) + #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) musicDriver = MD_WINDOWS; // MD_WINDOWS is default MidiDriver on windows targets #elif defined(MACOSX) musicDriver = MD_COREAUDIO; @@ -134,7 +134,7 @@ int MidiDriver::detectMusicDriver(int midiFlags) { musicDriver = MD_YPA1; // TODO : change this and use Zodiac driver when needed #elif defined(__MORPHOS__) musicDriver = MD_ETUDE; - #elif defined(_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND) + #elif defined(_WIN32_WCE) || defined(UNIX) || defined(X11_BACKEND) || defined (__SYMBIAN32__) // Always use MIDI emulation via adlib driver on CE and UNIX device // TODO: We should, for the Unix targets, attempt to detect @@ -195,7 +195,7 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { case MD_ZODIAC: return MidiDriver_Zodiac_create(); #endif #endif -#if defined(WIN32) && !defined(_WIN32_WCE) +#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) case MD_WINDOWS: return MidiDriver_WIN_create(); #endif #if defined(__MORPHOS__) |