aboutsummaryrefslogtreecommitdiff
path: root/graphics/sjis.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-08 07:13:56 +0000
committerFilippos Karapetis2009-07-08 07:13:56 +0000
commit570d157ff336d62f3e1c9435ebe1c13ed8332c08 (patch)
treef6c6aad5bbc4ce1e2c1c22352e710ca6149e4f8e /graphics/sjis.cpp
parentc3a335aacb68eff9638747562a38543d415cbf06 (diff)
downloadscummvm-rg350-570d157ff336d62f3e1c9435ebe1c13ed8332c08.tar.gz
scummvm-rg350-570d157ff336d62f3e1c9435ebe1c13ed8332c08.tar.bz2
scummvm-rg350-570d157ff336d62f3e1c9435ebe1c13ed8332c08.zip
The ENABLE_* flags are only checked for *.cpp files in MSVC, so move the ENABLE_* checks to sjis.cpp to fix compilation under MSVC
svn-id: r42257
Diffstat (limited to 'graphics/sjis.cpp')
-rw-r--r--graphics/sjis.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 5392a1c9a4..95736cf401 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -23,11 +23,16 @@
*/
#include "graphics/sjis.h"
-
-#ifdef GRAPHICS_SJIS_H
-
#include "common/debug.h"
+// The code in this file is currently only used in KYRA and SCI.
+// So if neither of those is 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_KYRA) || defined(ENABLE_SCI)
+
namespace Graphics {
bool FontTowns::loadFromStream(Common::ReadStream &stream) {
@@ -193,5 +198,5 @@ uint FontTowns::sjisToChunk(uint8 f, uint8 s) {
} // end of namespace Graphics
-#endif // defined(GRAPHICS_SJIS_H)
+#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)