[Scummvm-cvs-logs] SF.net SVN: scummvm:[46119] scummvm/trunk/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 46119
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46119&view=rev
Author:   Kirben
Date:     2009-11-24 00:15:10 +0000 (Tue, 24 Nov 2009)

Log Message:
-----------
Exclude PCE sound player, from non-16bit color build.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_pce.cpp
    scummvm/trunk/engines/scumm/player_pce.h
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/player_pce.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_pce.cpp	2009-11-23 23:55:19 UTC (rev 46118)
+++ scummvm/trunk/engines/scumm/player_pce.cpp	2009-11-24 00:15:10 UTC (rev 46119)
@@ -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 @@
 }
 
 } // End of namespace Scumm
+
+#endif // USE_RGB_COLOR

Modified: scummvm/trunk/engines/scumm/player_pce.h
===================================================================
--- scummvm/trunk/engines/scumm/player_pce.h	2009-11-23 23:55:19 UTC (rev 46118)
+++ scummvm/trunk/engines/scumm/player_pce.h	2009-11-24 00:15:10 UTC (rev 46119)
@@ -31,6 +31,8 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 
+#ifdef USE_RGB_COLOR
+
 namespace Scumm {
 
 class ScummEngine;
@@ -128,4 +130,6 @@
 
 } // End of namespace Scumm
 
+#endif // USE_RGB_COLOR
+
 #endif

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2009-11-23 23:55:19 UTC (rev 46118)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2009-11-24 00:15:10 UTC (rev 46119)
@@ -1726,8 +1726,10 @@
 		_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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.