[Scummvm-cvs-logs] SF.net SVN: scummvm:[43075] scummvm/branches/gsoc2009-mods/sound/mods

[nolange at users.sourceforge.net]

Revision: 43075
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43075&view=rev
Author:   nolange
Date:     2009-08-05 18:45:22 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
moved check if class should be compiled to the header

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h

Modified: scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp	2009-08-05 18:13:42 UTC (rev 43074)
+++ scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp	2009-08-05 18:45:22 UTC (rev 43075)
@@ -31,7 +31,7 @@
 #include "sound/mods/maxtrax.h"
 
 // test for engines using this class.
-#if defined(ENABLE_KYRA)
+#if defined(SOUND_MODS_MAXTRAX_H)
 
 namespace Audio {
 

Modified: scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h	2009-08-05 18:13:42 UTC (rev 43074)
+++ scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.h	2009-08-05 18:45:22 UTC (rev 43075)
@@ -23,7 +23,11 @@
  *
  */
 
-#ifndef SOUND_MODS_MAXTRAX_H
+// see if all engines using this class are DISABLED
+#if !defined(ENABLE_KYRA)
+
+// normal Header Guard
+#elif !defined SOUND_MODS_MAXTRAX_H
 #define SOUND_MODS_MAXTRAX_H
 
 #include "sound/mods/paula.h"

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-05 18:13:42 UTC (rev 43074)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-05 18:45:22 UTC (rev 43075)
@@ -32,7 +32,7 @@
 #include "sound/mods/tfmx.h"
 
 // test for engines using this class.
-#if defined(ENABLE_SCUMM)
+#if defined(SOUND_MODS_TFMX_H)
 
 // couple debug-functions
 namespace {

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-05 18:13:42 UTC (rev 43074)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.h	2009-08-05 18:45:22 UTC (rev 43075)
@@ -23,7 +23,11 @@
  *
  */
 
-#ifndef SOUND_MODS_TFMX_H
+// see if all engines using this class are DISABLED
+#if !defined(ENABLE_SCUMM)
+
+// normal Header Guard
+#elif !defined(SOUND_MODS_TFMX_H)
 #define SOUND_MODS_TFMX_H
 
 #include "sound/mods/paula.h"
@@ -277,4 +281,4 @@
 
 }	// End of namespace Audio
 
-#endif
+#endif // !defined(SOUND_MODS_TFMX_H)


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