aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-08 07:28:13 +0000
committerFilippos Karapetis2009-07-08 07:28:13 +0000
commit90422f6bd3e7f4b6c1df82124ce5000986822651 (patch)
tree56b108cd54720f6f06f9f3996c6fcb4d1ed4d0a7
parent4e44217047ba7f361412b9b550c7eafa013d8fbe (diff)
downloadscummvm-rg350-90422f6bd3e7f4b6c1df82124ce5000986822651.tar.gz
scummvm-rg350-90422f6bd3e7f4b6c1df82124ce5000986822651.tar.bz2
scummvm-rg350-90422f6bd3e7f4b6c1df82124ce5000986822651.zip
Added guards to only include the Shorten audio code when the SAGA2 code in the SAGA engine is enabled
svn-id: r42259
-rw-r--r--sound/shorten.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/shorten.cpp b/sound/shorten.cpp
index b550a5afec..d1031aed3a 100644
--- a/sound/shorten.cpp
+++ b/sound/shorten.cpp
@@ -23,6 +23,14 @@
*
*/
+// The code in this file is currently only used in SAGA2 (in the
+// SAGA engine), so if that engine isn't enabled, we will skip
+// compiling it. If you plan to use this code in another engine,
+// you will have to add the proper define check here.
+// Also please add the define check at the comment after the
+// matching #endif further down this file.
+#if defined(ENABLE_SAGA2)
+
// Based on etree's Shorten tool, version 3.6.1
// http://etree.org/shnutils/shorten/
@@ -526,3 +534,6 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) {
}
} // End of namespace Audio
+
+#endif // defined(ENABLE_SAGA2)
+