[Scummvm-devel] [Scummvm-cvs-logs] SF.net SVN: scummvm:[42257] scummvm/trunk/graphics
Max Horn
max at quendi.de
Wed Jul 8 15:33:51 CEST 2009
Am 08.07.2009 um 09:13 schrieb thebluegr at users.sourceforge.net:
> Revision: 42257
> http://scummvm.svn.sourceforge.net/scummvm/?
> rev=42257&view=rev
> Author: thebluegr
> Date: 2009-07-08 07:13:56 +0000 (Wed, 08 Jul 2009)
>
> Log Message:
> -----------
> The ENABLE_* flags are only checked for *.cpp files in MSVC, so move
> the ENABLE_* checks to sjis.cpp to fix compilation under MSVC
>
I don't understand, what does that mean??? Do you mean to say these
flags are only #defined in the .cpp files? That would be most weird.
Or maybe MSVC doesn't #define them globally at all but rather relies
on these values being set from config.h -- in that case, the solution
would be to add an #include "common/scummsys.h" at the top of the
header.
But moving the check from the header file to the source file seems
wrong.
Cheers,
Max
> Modified Paths:
> --------------
> scummvm/trunk/graphics/sjis.cpp
> scummvm/trunk/graphics/sjis.h
>
> Modified: scummvm/trunk/graphics/sjis.cpp
> ===================================================================
> --- scummvm/trunk/graphics/sjis.cpp 2009-07-08 07:11:43 UTC (rev
> 42256)
> +++ scummvm/trunk/graphics/sjis.cpp 2009-07-08 07:13:56 UTC (rev
> 42257)
> @@ -23,11 +23,16 @@
> */
>
> #include "graphics/sjis.h"
> +#include "common/debug.h"
>
> -#ifdef GRAPHICS_SJIS_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)
>
> -#include "common/debug.h"
> -
> namespace Graphics {
>
> bool FontTowns::loadFromStream(Common::ReadStream &stream) {
> @@ -193,5 +198,5 @@
>
> } // end of namespace Graphics
>
> -#endif // defined(GRAPHICS_SJIS_H)
> +#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
>
>
> Modified: scummvm/trunk/graphics/sjis.h
> ===================================================================
> --- scummvm/trunk/graphics/sjis.h 2009-07-08 07:11:43 UTC (rev 42256)
> +++ scummvm/trunk/graphics/sjis.h 2009-07-08 07:13:56 UTC (rev 42257)
> @@ -22,14 +22,6 @@
> * $Id$
> */
>
> -// 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)
> -
> #ifndef GRAPHICS_SJIS_H
> #define GRAPHICS_SJIS_H
>
> @@ -131,5 +123,3 @@
>
> #endif
>
> -#endif // defined(ENABLE_KYRA) || defined(ENABLE_SCI)
> -
>
>
> This was sent by the SourceForge.net collaborative development
> platform, the world's largest Open Source development site.
>
> ------------------------------------------------------------------------------
> Enter the BlackBerry Developer Challenge
> This is your chance to win up to $100,000 in prizes! For a limited
> time,
> vendors submitting new applications to BlackBerry App World(TM) will
> have
> the opportunity to enter the BlackBerry Developer Challenge. See
> full prize
> details at: http://p.sf.net/sfu/Challenge
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs
>
More information about the Scummvm-devel
mailing list