diff options
| author | Neil Millstone | 2010-02-26 17:42:40 +0000 |
|---|---|---|
| committer | Neil Millstone | 2010-02-26 17:42:40 +0000 |
| commit | 277b3078bcd1f655ad54504959091047a496be6c (patch) | |
| tree | bb87732361d6eacdd50e2ebfd488ed9766cdf85a | |
| parent | 4a8ab4b075a186ce70c441ee0ceb3f6d5019d948 (diff) | |
| download | scummvm-rg350-277b3078bcd1f655ad54504959091047a496be6c.tar.gz scummvm-rg350-277b3078bcd1f655ad54504959091047a496be6c.tar.bz2 scummvm-rg350-277b3078bcd1f655ad54504959091047a496be6c.zip | |
SID: Adding DISABLE_SID option, as SID player embiggens binary by a large amount. This is a problem for the DS port.
svn-id: r48137
| -rw-r--r-- | engines/scumm/player_sid.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 | ||||
| -rw-r--r-- | sound/softsynth/sid.cpp | 4 | ||||
| -rw-r--r-- | sound/softsynth/wave6581.cpp | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/engines/scumm/player_sid.cpp b/engines/scumm/player_sid.cpp index 0d7bb380b9..a17343b4a4 100644 --- a/engines/scumm/player_sid.cpp +++ b/engines/scumm/player_sid.cpp @@ -23,6 +23,8 @@ * */ +#ifndef DISABLE_SID + #include "engines/engine.h" #include "scumm/player_sid.h" #include "scumm/scumm.h" @@ -1389,3 +1391,5 @@ int Player_SID::getMusicTimer() { } } // End of namespace Scumm + +#endif diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 3e30ea04cc..c2a2d621af 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1710,7 +1710,9 @@ void ScummEngine::setupMusic(int midi) { } else if (_game.platform == Common::kPlatformApple2GS && _game.version == 0){ // TODO: Add support for music format } else if (_game.platform == Common::kPlatformC64 && _game.version <= 1) { +#ifndef DISABLE_SID _musicEngine = new Player_SID(this, _mixer); +#endif } else if (_game.platform == Common::kPlatformNES && _game.version == 1) { _musicEngine = new Player_NES(this, _mixer); } else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) { diff --git a/sound/softsynth/sid.cpp b/sound/softsynth/sid.cpp index 8d8a75ab0b..e0dfd2efc0 100644 --- a/sound/softsynth/sid.cpp +++ b/sound/softsynth/sid.cpp @@ -28,6 +28,8 @@ * Copyright (C) 2004 Dag Lem <resid@nimrod.no> */ +#ifndef DISABLE_SID + #include "sid.h" #include <math.h> @@ -1424,3 +1426,5 @@ int SID::clock(cycle_count& delta_t, short* buf, int n, int interleave) { } } + +#endif diff --git a/sound/softsynth/wave6581.cpp b/sound/softsynth/wave6581.cpp index 29a4962c3c..29998dcd0a 100644 --- a/sound/softsynth/wave6581.cpp +++ b/sound/softsynth/wave6581.cpp @@ -28,6 +28,8 @@ * Copyright (C) 2004 Dag Lem <resid@nimrod.no> */ +#ifndef DISABLE_SID + #include "sid.h" namespace Resid @@ -2098,3 +2100,4 @@ reg8 WaveformGenerator::wave6581_PST[] = }; } +#endif |