[Scummvm-cvs-logs] SF.net SVN: scummvm:[43318] scummvm/trunk/graphics/sjis.h

[lordhoto at users.sourceforge.net]

Revision: 43318
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43318&view=rev
Author:   lordhoto
Date:     2009-08-12 14:02:18 +0000 (Wed, 12 Aug 2009)

Log Message:
-----------
Change SJIS code guard to also check whether dynamic plugins are enabled.

Modified Paths:
--------------
    scummvm/trunk/graphics/sjis.h

Modified: scummvm/trunk/graphics/sjis.h
===================================================================
--- scummvm/trunk/graphics/sjis.h	2009-08-12 13:59:11 UTC (rev 43317)
+++ scummvm/trunk/graphics/sjis.h	2009-08-12 14:02:18 UTC (rev 43318)
@@ -24,12 +24,16 @@
 
 // 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 @@
 
 #endif
 
-#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
+#endif // engine and dynamic plugins guard
 


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