[Scummvm-cvs-logs] scummvm master -> 5230a0d61795e2855625a43d60dc3bc2ed83fc3d

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5230a0d617 AUDIO: Make sure maxtrax and tfmx are compiled in with dynamic modules


Commit: 5230a0d61795e2855625a43d60dc3bc2ed83fc3d
    https://github.com/scummvm/scummvm/commit/5230a0d61795e2855625a43d60dc3bc2ed83fc3d
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-06-15T19:48:26-07:00

Commit Message:
AUDIO: Make sure maxtrax and tfmx are compiled in with dynamic modules

Changed paths:
    audio/mods/maxtrax.h
    audio/mods/tfmx.h



diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h
index c45a21a..ffb176c 100644
--- a/audio/mods/maxtrax.h
+++ b/audio/mods/maxtrax.h
@@ -20,11 +20,8 @@
  *
  */
 
-// see if all engines using this class are DISABLED
-#if !defined(ENABLE_KYRA)
-
-// normal Header Guard
-#elif !defined(AUDIO_MODS_MAXTRAX_H)
+// Only compiled if Kyra is built-in or we're building for dynamic modules
+#if !defined(AUDIO_MODS_MAXTRAX_H) && (defined(ENABLE_KYRA) || defined(DYNAMIC_MODULES))
 #define AUDIO_MODS_MAXTRAX_H
 
 // #define MAXTRAX_HAS_MODULATION
diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h
index 4174fbf..ebe1172 100644
--- a/audio/mods/tfmx.h
+++ b/audio/mods/tfmx.h
@@ -20,11 +20,8 @@
  *
  */
 
-// see if all engines using this class are DISABLED
-#if !defined(ENABLE_SCUMM)
-
-// normal Header Guard
-#elif !defined(AUDIO_MODS_TFMX_H)
+// Only compiled if SCUMM is built-in or we're building for dynamic modules
+#if !defined(AUDIO_MODS_TFMX_H) && (defined(ENABLE_SCUMM) || defined(DYNAMIC_MODULES))
 #define AUDIO_MODS_TFMX_H
 
 #include "audio/mods/paula.h"