[Scummvm-cvs-logs] SF.net SVN: scummvm:[48137] scummvm/trunk

[agent-q at users.sourceforge.net]

Revision: 48137
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48137&view=rev
Author:   agent-q
Date:     2010-02-26 17:42:40 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
SID: Adding DISABLE_SID option, as SID player embiggens binary by a large amount.  This is a problem for the DS port.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_sid.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/sound/softsynth/sid.cpp
    scummvm/trunk/sound/softsynth/wave6581.cpp

Modified: scummvm/trunk/engines/scumm/player_sid.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_sid.cpp	2010-02-26 17:29:18 UTC (rev 48136)
+++ scummvm/trunk/engines/scumm/player_sid.cpp	2010-02-26 17:42:40 UTC (rev 48137)
@@ -23,6 +23,8 @@
  *
  */
 
+#ifndef DISABLE_SID
+
 #include "engines/engine.h"
 #include "scumm/player_sid.h"
 #include "scumm/scumm.h"
@@ -1389,3 +1391,5 @@
 }
 
 } // End of namespace Scumm
+
+#endif

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-02-26 17:29:18 UTC (rev 48136)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-02-26 17:42:40 UTC (rev 48137)
@@ -1710,7 +1710,9 @@
 	} 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) {

Modified: scummvm/trunk/sound/softsynth/sid.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/sid.cpp	2010-02-26 17:29:18 UTC (rev 48136)
+++ scummvm/trunk/sound/softsynth/sid.cpp	2010-02-26 17:42:40 UTC (rev 48137)
@@ -28,6 +28,8 @@
  *  Copyright (C) 2004  Dag Lem <resid at nimrod.no>
  */
 
+#ifndef DISABLE_SID
+
 #include "sid.h"
 #include <math.h>
 
@@ -1424,3 +1426,5 @@
 }
 
 }
+
+#endif

Modified: scummvm/trunk/sound/softsynth/wave6581.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/wave6581.cpp	2010-02-26 17:29:18 UTC (rev 48136)
+++ scummvm/trunk/sound/softsynth/wave6581.cpp	2010-02-26 17:42:40 UTC (rev 48137)
@@ -28,6 +28,8 @@
  *  Copyright (C) 2004  Dag Lem <resid at nimrod.no>
  */
 
+#ifndef DISABLE_SID
+
 #include "sid.h"
 
 namespace Resid
@@ -2098,3 +2100,4 @@
 };
 
 }
+#endif


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