[Scummvm-cvs-logs] SF.net SVN: scummvm:[53423] scummvm/trunk/engines/sword25/fmv

[thebluegr at users.sourceforge.net]

Revision: 53423
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53423&view=rev
Author:   thebluegr
Date:     2010-10-13 14:13:48 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
SWORD25: Include common/scummsys.h in places where USE_THEORADEC is used

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/fmv/movieplayer.h
    scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
    scummvm/trunk/engines/sword25/fmv/theora_decoder.h
    scummvm/trunk/engines/sword25/fmv/yuvtorgba.h

Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.h	2010-10-13 14:00:29 UTC (rev 53422)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.h	2010-10-13 14:13:48 UTC (rev 53423)
@@ -35,13 +35,14 @@
 #ifndef SWORD25_MOVIEPLAYER_H
 #define SWORD25_MOVIEPLAYER_H
 
+#include "common/scummsys.h"	// for USE_THEORADEC
+
+#ifdef USE_THEORADEC
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/service.h"
 #include "sword25/fmv/theora_decoder.h"
 #include "sword25/gfx/bitmap.h"
 
-#ifdef USE_THEORADEC
-
 namespace Sword25 {
 
 class MoviePlayer : public Service {

Modified: scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp	2010-10-13 14:00:29 UTC (rev 53422)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer_script.cpp	2010-10-13 14:13:48 UTC (rev 53423)
@@ -32,6 +32,8 @@
  *
  */
 
+#include "common/scummsys.h"	// for USE_THEORADEC
+
 #include "sword25/kernel/common.h"
 #include "sword25/kernel/kernel.h"
 #include "sword25/script/script.h"

Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.h	2010-10-13 14:00:29 UTC (rev 53422)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.h	2010-10-13 14:13:48 UTC (rev 53423)
@@ -26,6 +26,8 @@
 #ifndef SWORD25_THEORADECODER_H
 #define SWORD25_THEORADECODER_H
 
+#include "common/scummsys.h"	// for USE_THEORADEC
+
 #ifdef USE_THEORADEC
 
 #include "graphics/video/video_decoder.h"

Modified: scummvm/trunk/engines/sword25/fmv/yuvtorgba.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/yuvtorgba.h	2010-10-13 14:00:29 UTC (rev 53422)
+++ scummvm/trunk/engines/sword25/fmv/yuvtorgba.h	2010-10-13 14:13:48 UTC (rev 53423)
@@ -35,9 +35,10 @@
 #ifndef SWORD25_YUVTORGBA_H
 #define SWORD25_YUVTORGBA_H
 
-#include "sword25/kernel/common.h"
+#include "common/scummsys.h"	// for USE_THEORADEC
 
 #ifdef USE_THEORADEC
+#include "sword25/kernel/common.h"
 #include <theora/theora.h>
 #include <theora/codec.h>
 


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