diff options
| author | Travis Howell | 2009-11-24 00:15:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-11-24 00:15:10 +0000 |
| commit | 47e358cd12dcb2fc044fda26e0c3216519bd1e22 (patch) | |
| tree | 658374bd430db68c1f22dc55ea4deaa153c00089 | |
| parent | 65eae0b53e367f32af8bc38223726fafd27d3726 (diff) | |
| download | scummvm-rg350-47e358cd12dcb2fc044fda26e0c3216519bd1e22.tar.gz scummvm-rg350-47e358cd12dcb2fc044fda26e0c3216519bd1e22.tar.bz2 scummvm-rg350-47e358cd12dcb2fc044fda26e0c3216519bd1e22.zip | |
Exclude PCE sound player, from non-16bit color build.
svn-id: r46119
| -rw-r--r-- | engines/scumm/player_pce.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/player_pce.h | 4 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/engines/scumm/player_pce.cpp b/engines/scumm/player_pce.cpp index a476a71197..81f70c283e 100644 --- a/engines/scumm/player_pce.cpp +++ b/engines/scumm/player_pce.cpp @@ -34,6 +34,8 @@ #include <math.h> #include "player_pce.h" +#ifdef USE_RGB_COLOR + namespace Scumm { // CPU and PSG use the same base clock but with a different divider @@ -753,3 +755,5 @@ int Player_PCE::getMusicTimer() const { } } // End of namespace Scumm + +#endif // USE_RGB_COLOR diff --git a/engines/scumm/player_pce.h b/engines/scumm/player_pce.h index 479ec5c506..c30e1bd8cf 100644 --- a/engines/scumm/player_pce.h +++ b/engines/scumm/player_pce.h @@ -31,6 +31,8 @@ #include "sound/audiostream.h" #include "sound/mixer.h" +#ifdef USE_RGB_COLOR + namespace Scumm { class ScummEngine; @@ -128,4 +130,6 @@ private: } // End of namespace Scumm +#endif // USE_RGB_COLOR + #endif diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 8d3c3c0957..309e79b7a0 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1726,8 +1726,10 @@ void ScummEngine::setupMusic(int midi) { _musicEngine = new Player_V2A(this, _mixer); } else if (_game.platform == Common::kPlatformAmiga && _game.version == 3) { _musicEngine = new Player_V3A(this, _mixer); +#ifdef USE_RGB_COLOR } else if (_game.platform == Common::kPlatformPCEngine && _game.version == 3) { _musicEngine = new Player_PCE(this, _mixer); +#endif } else if (_game.platform == Common::kPlatformAmiga && _game.version <= 4) { _musicEngine = new Player_V4A(this, _mixer); } else if (_game.id == GID_MANIAC && _game.version == 1) { |