aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-10-13 14:13:48 +0000
committerFilippos Karapetis2010-10-13 14:13:48 +0000
commitde3534fcd3a8c2041b9b8e1d78ed952409726053 (patch)
tree5ff1fd89d14a47fe51b61ca6cad654f84abfe1a3
parent01b4d4e913bdae5e0ccaec6029ff3312c86c0eb8 (diff)
downloadscummvm-rg350-de3534fcd3a8c2041b9b8e1d78ed952409726053.tar.gz
scummvm-rg350-de3534fcd3a8c2041b9b8e1d78ed952409726053.tar.bz2
scummvm-rg350-de3534fcd3a8c2041b9b8e1d78ed952409726053.zip
SWORD25: Include common/scummsys.h in places where USE_THEORADEC is used
svn-id: r53423
-rw-r--r--engines/sword25/fmv/movieplayer.h5
-rw-r--r--engines/sword25/fmv/movieplayer_script.cpp2
-rw-r--r--engines/sword25/fmv/theora_decoder.h2
-rw-r--r--engines/sword25/fmv/yuvtorgba.h3
4 files changed, 9 insertions, 3 deletions
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h
index d8c5069f9e..c02285df74 100644
--- a/engines/sword25/fmv/movieplayer.h
+++ b/engines/sword25/fmv/movieplayer.h
@@ -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 {
diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp
index eb352e19f5..e4c24bf922 100644
--- a/engines/sword25/fmv/movieplayer_script.cpp
+++ b/engines/sword25/fmv/movieplayer_script.cpp
@@ -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"
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index 13765e2ede..f6c622563b 100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -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"
diff --git a/engines/sword25/fmv/yuvtorgba.h b/engines/sword25/fmv/yuvtorgba.h
index f4973a6fbc..675248e6e0 100644
--- a/engines/sword25/fmv/yuvtorgba.h
+++ b/engines/sword25/fmv/yuvtorgba.h
@@ -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>