SWORD25: Path fixes for includes

svn-id: r53180

16 files changed, 62 insertions, 63 deletions

diff --git a/engines/sword25/fmv/oggtheora/audiobuffer.cpp b/engines/sword25/fmv/oggtheora/audiobuffer.cpp
index 9161c18fa8..1ad9620134 100755
--- a/engines/sword25/fmv/oggtheora/audiobuffer.cpp
+++ b/engines/sword25/fmv/oggtheora/audiobuffer.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "audiobuffer.h"
+#include "sword25/fmv/oggtheora/audiobuffer.h"
 #include <windows.h>
 #include <queue>
 
diff --git a/engines/sword25/fmv/oggtheora/audiobuffer.h b/engines/sword25/fmv/oggtheora/audiobuffer.h
index c0c19811be..a040caf5ab 100755
--- a/engines/sword25/fmv/oggtheora/audiobuffer.h
+++ b/engines/sword25/fmv/oggtheora/audiobuffer.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_AUDIOBUFFER_H
-#define BS_AUDIOBUFFER_H
+#ifndef SWORD25_AUDIOBUFFER_H
+#define SWORD25_AUDIOBUFFER_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/moviefile.cpp b/engines/sword25/fmv/oggtheora/moviefile.cpp
index 92cbdad844..3b68a96c5c 100755
--- a/engines/sword25/fmv/oggtheora/moviefile.cpp
+++ b/engines/sword25/fmv/oggtheora/moviefile.cpp
@@ -27,10 +27,10 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/kernel.h"
-#include "package/packagemanager.h"
-#include "oggstate.h"
-#include "moviefile.h"
+#include "sword25/kernel/kernel.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
+#include "sword25/fmv/oggtheora/moviefile.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/moviefile.h b/engines/sword25/fmv/oggtheora/moviefile.h
index 17935789b7..35566a56ca 100755
--- a/engines/sword25/fmv/oggtheora/moviefile.h
+++ b/engines/sword25/fmv/oggtheora/moviefile.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_MOVIEFILE_H
-#define BS_MOVIEFILE_H
+#ifndef SWORD25_MOVIEFILE_H
+#define SWORD25_MOVIEFILE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <string>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/oggstate.cpp b/engines/sword25/fmv/oggtheora/oggstate.cpp
index d8300693c9..d6da995d0c 100755
--- a/engines/sword25/fmv/oggtheora/oggstate.cpp
+++ b/engines/sword25/fmv/oggtheora/oggstate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "oggstate.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/oggstate.h b/engines/sword25/fmv/oggtheora/oggstate.h
index 18b44e375f..2196e41b7c 100755
--- a/engines/sword25/fmv/oggtheora/oggstate.h
+++ b/engines/sword25/fmv/oggtheora/oggstate.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OGGSTATE_H
-#define BS_OGGSTATE_H
+#ifndef SWORD25_OGGSTATE_H
+#define SWORD25_OGGSTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 #include "ogg/ogg.h"
 // XXX
 #include <iostream>
diff --git a/engines/sword25/fmv/oggtheora/oggstreamstate.cpp b/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
index da4dc317b5..05629be82b 100755
--- a/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
+++ b/engines/sword25/fmv/oggtheora/oggstreamstate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "oggstreamstate.h"
+#include "sword25/fmv/oggtheora/oggstreamstate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/oggstreamstate.h b/engines/sword25/fmv/oggtheora/oggstreamstate.h
index 9460c7286f..7b296b82aa 100755
--- a/engines/sword25/fmv/oggtheora/oggstreamstate.h
+++ b/engines/sword25/fmv/oggtheora/oggstreamstate.h
@@ -17,14 +17,14 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OGGSTREAMSTATE_H
-#define BS_OGGSTREAMSTATE_H
+#ifndef SWORD25_OGGSTREAMSTATE_H
+#define SWORD25_OGGSTREAMSTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 #include "ogg/ogg.h"
 #include <queue>
 // XXX
diff --git a/engines/sword25/fmv/oggtheora/oggtheora.cpp b/engines/sword25/fmv/oggtheora/oggtheora.cpp
index c5436dcc8f..dcff5e025b 100755
--- a/engines/sword25/fmv/oggtheora/oggtheora.cpp
+++ b/engines/sword25/fmv/oggtheora/oggtheora.cpp
@@ -59,18 +59,17 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <algorithm>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 #include <float.h>
 
-#include "package/packagemanager.h"
-#include "kernel/cpuinfo.h"
-#include "sfx/soundengine.h"
-#include "gfx/graphicengine.h"
-#include "gfx/panel.h"
-#include "oggtheora.h"
-#include "yuvtorgba.h"
+#include "sword25/package/packagemanager.h"
+#include "sword25/sfx/soundengine.h"
+#include "sword25/gfx/graphicengine.h"
+#include "sword25/gfx/panel.h"
+#include "sword25/fmv/oggtheora/oggtheora.h"
+#include "sword25/fmv/oggtheora/yuvtorgba.h"
 
 using namespace std;
 
diff --git a/engines/sword25/fmv/oggtheora/oggtheora.h b/engines/sword25/fmv/oggtheora/oggtheora.h
index 0b43ba698d..516f5cc072 100755
--- a/engines/sword25/fmv/oggtheora/oggtheora.h
+++ b/engines/sword25/fmv/oggtheora/oggtheora.h
@@ -17,30 +17,30 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_OGGTHEORA_H
-#define BS_OGGTHEORA_H
+#ifndef SWORD25_OGGTHEORA_H
+#define SWORD25_OGGTHEORA_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
 #include <memory>
 #include <queue>
-#include "kernel/memlog_on.h"
-
-#include "kernel/common.h"
-#include "kernel/bs_stdint.h"
-#include "gfx/bitmap.h"
-#include "gfx/renderobjectptr.h"
-#include "fmv/movieplayer.h"
-#include "vorbisstate.h"
-#include "theorastate.h"
-#include "oggstate.h"
-#include "oggstreamstate.h"
-#include "moviefile.h"
-#include "audiobuffer.h"
+#include "sword25/kernel/memlog_on.h"
+
+#include "sword25/kernel/common.h"
+#include "sword25/kernel/bs_stdint.h"
+#include "sword25/gfx/bitmap.h"
+#include "sword25/gfx/renderobjectptr.h"
+#include "sword25/fmv/movieplayer.h"
+#include "sword25/fmv/oggtheora/vorbisstate.h"
+#include "sword25/fmv/oggtheora/theorastate.h"
+#include "sword25/fmv/oggtheora/oggstate.h"
+#include "sword25/fmv/oggtheora/oggstreamstate.h"
+#include "sword25/fmv/oggtheora/moviefile.h"
+#include "sword25/fmv/oggtheora/audiobuffer.h"
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/theorastate.cpp b/engines/sword25/fmv/oggtheora/theorastate.cpp
index 853ef911ba..3d3c4018e4 100755
--- a/engines/sword25/fmv/oggtheora/theorastate.cpp
+++ b/engines/sword25/fmv/oggtheora/theorastate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "theorastate.h"
+#include "sword25/fmv/oggtheora/theorastate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/theorastate.h b/engines/sword25/fmv/oggtheora/theorastate.h
index 582215bad9..3a88b6fdab 100755
--- a/engines/sword25/fmv/oggtheora/theorastate.h
+++ b/engines/sword25/fmv/oggtheora/theorastate.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_THEORASTATE_H
-#define BS_THEORASTATE_H
+#ifndef SWORD25_THEORASTATE_H
+#define SWORD25_THEORASTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "theora/theora.h"
+#include "sword25/kernel/common.h"
+#include <theora/theora.h>
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/vorbisstate.cpp b/engines/sword25/fmv/oggtheora/vorbisstate.cpp
index 683b6fd0d7..a2df701ba2 100755
--- a/engines/sword25/fmv/oggtheora/vorbisstate.cpp
+++ b/engines/sword25/fmv/oggtheora/vorbisstate.cpp
@@ -21,7 +21,7 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "vorbisstate.h"
+#include "sword25/fmv/oggtheora/vorbisstate.h"
 
 // -----------------------------------------------------------------------------
 
diff --git a/engines/sword25/fmv/oggtheora/vorbisstate.h b/engines/sword25/fmv/oggtheora/vorbisstate.h
index 193e115637..87e027e175 100755
--- a/engines/sword25/fmv/oggtheora/vorbisstate.h
+++ b/engines/sword25/fmv/oggtheora/vorbisstate.h
@@ -17,15 +17,15 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_VORBISSTATE_H
-#define BS_VORBISSTATE_H
+#ifndef SWORD25_VORBISSTATE_H
+#define SWORD25_VORBISSTATE_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/common.h"
-#include "vorbis/codec.h"
+#include "sword25/kernel/common.h"
+#include <vorbis/codec.h>
 
 // -----------------------------------------------------------------------------
 // Klassendefinition
diff --git a/engines/sword25/fmv/oggtheora/yuvtorgba.cpp b/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
index 0e709b12e0..9fc2c0ae58 100755
--- a/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
+++ b/engines/sword25/fmv/oggtheora/yuvtorgba.cpp
@@ -21,8 +21,8 @@
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/cpuinfo.h"
-#include "yuvtorgba.h"
+#include "sword25/kernel/cpuinfo.h"
+#include "sword25/fmv/ogghteora/yuvtorgba.h"
 
 #include <mmintrin.h>
 
diff --git a/engines/sword25/fmv/oggtheora/yuvtorgba.h b/engines/sword25/fmv/oggtheora/yuvtorgba.h
index 0bd74e5a18..116e854494 100755
--- a/engines/sword25/fmv/oggtheora/yuvtorgba.h
+++ b/engines/sword25/fmv/oggtheora/yuvtorgba.h
@@ -17,18 +17,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 // -----------------------------------------------------------------------------
 
-#ifndef BS_YUVTORGBA_H
-#define BS_YUVTORGBA_H
+#ifndef SWORD25_YUVTORGBA_H
+#define SWORD25_YUVTORGBA_H
 
 // -----------------------------------------------------------------------------
 // Includes
 // -----------------------------------------------------------------------------
 
-#include "kernel/memlog_off.h"
+#include "sword25/kernel/memlog_off.h"
 #include <vector>
-#include "kernel/memlog_on.h"
+#include "sword25/kernel/memlog_on.h"
 
-#include "kernel/common.h"
+#include "sword25/kernel/common.h"
 #include "theora/theora.h"
 
 // -----------------------------------------------------------------------------