diff options
| author | Johannes Schickel | 2009-08-12 14:02:18 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-12 14:02:18 +0000 |
| commit | cf336367e5947f55f1cd79fd6773a5092d6b2352 (patch) | |
| tree | 209301fe9fa0999e5c52db37bf1098e07b3dd0cd /graphics/sjis.h | |
| parent | ca7b4db0ae66fd93b5d4da91e067c80be6c50d3f (diff) | |
| download | scummvm-rg350-cf336367e5947f55f1cd79fd6773a5092d6b2352.tar.gz scummvm-rg350-cf336367e5947f55f1cd79fd6773a5092d6b2352.tar.bz2 scummvm-rg350-cf336367e5947f55f1cd79fd6773a5092d6b2352.zip | |
Change SJIS code guard to also check whether dynamic plugins are enabled.
svn-id: r43318
Diffstat (limited to 'graphics/sjis.h')
| -rw-r--r-- | graphics/sjis.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/graphics/sjis.h b/graphics/sjis.h index b5d997a19a..93279d0dd5 100644 --- a/graphics/sjis.h +++ b/graphics/sjis.h @@ -24,11 +24,15 @@ // 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. +// We also enable this code for ScummVM builds including support +// for dynamic engine plugins. // 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) +#if !(defined(ENABLE_KYRA) || defined(ENABLE_SCI) || defined(DYNAMIC_MODULES)) + +// If neither of the above mentioned is enabled, do not include the SJIS code. + +#else #ifndef GRAPHICS_SJIS_H #define GRAPHICS_SJIS_H @@ -184,5 +188,5 @@ private: #endif -#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI) +#endif // engine and dynamic plugins guard |