aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2009-04-29 23:54:29 +0000
committerSven Hesse2009-04-29 23:54:29 +0000
commitced59ea5e90fafff585f72395ca75aa1b7b829e8 (patch)
tree8b8c49fb43ef5a4e9817b8d91d2f7618068d3ed2
parentd0c88ca6a096e1c3bfcd28b65d50544d5abc3132 (diff)
downloadscummvm-rg350-ced59ea5e90fafff585f72395ca75aa1b7b829e8.tar.gz
scummvm-rg350-ced59ea5e90fafff585f72395ca75aa1b7b829e8.tar.bz2
scummvm-rg350-ced59ea5e90fafff585f72395ca75aa1b7b829e8.zip
Moving the demo-related stuff into a demos-subdirectory
svn-id: r40212
-rw-r--r--engines/gob/demos/batplayer.cpp (renamed from engines/gob/batplayer.cpp)2
-rw-r--r--engines/gob/demos/batplayer.h (renamed from engines/gob/batplayer.h)2
-rw-r--r--engines/gob/demos/demoplayer.cpp (renamed from engines/gob/demoplayer.cpp)2
-rw-r--r--engines/gob/demos/demoplayer.h (renamed from engines/gob/demoplayer.h)0
-rw-r--r--engines/gob/demos/scnplayer.cpp (renamed from engines/gob/scnplayer.cpp)2
-rw-r--r--engines/gob/demos/scnplayer.h (renamed from engines/gob/scnplayer.h)2
-rw-r--r--engines/gob/init.cpp4
-rw-r--r--engines/gob/module.mk6
8 files changed, 10 insertions, 10 deletions
diff --git a/engines/gob/batplayer.cpp b/engines/gob/demos/batplayer.cpp
index 563a1809d3..d3aae2691d 100644
--- a/engines/gob/batplayer.cpp
+++ b/engines/gob/demos/batplayer.cpp
@@ -26,7 +26,7 @@
#include "common/endian.h"
#include "gob/gob.h"
-#include "gob/batplayer.h"
+#include "gob/demos/batplayer.h"
#include "gob/global.h"
#include "gob/util.h"
#include "gob/draw.h"
diff --git a/engines/gob/batplayer.h b/engines/gob/demos/batplayer.h
index bbce238f06..861b0b8749 100644
--- a/engines/gob/batplayer.h
+++ b/engines/gob/demos/batplayer.h
@@ -28,7 +28,7 @@
#include "common/file.h"
-#include "demoplayer.h"
+#include "gob/demos/demoplayer.h"
namespace Gob {
diff --git a/engines/gob/demoplayer.cpp b/engines/gob/demos/demoplayer.cpp
index 4f6327aeed..c19a955981 100644
--- a/engines/gob/demoplayer.cpp
+++ b/engines/gob/demos/demoplayer.cpp
@@ -26,7 +26,7 @@
#include "common/endian.h"
#include "gob/gob.h"
-#include "gob/demoplayer.h"
+#include "gob/demos/demoplayer.h"
#include "gob/global.h"
#include "gob/util.h"
#include "gob/draw.h"
diff --git a/engines/gob/demoplayer.h b/engines/gob/demos/demoplayer.h
index c26ecacaa9..c26ecacaa9 100644
--- a/engines/gob/demoplayer.h
+++ b/engines/gob/demos/demoplayer.h
diff --git a/engines/gob/scnplayer.cpp b/engines/gob/demos/scnplayer.cpp
index bd42cee09f..3b4fd498de 100644
--- a/engines/gob/scnplayer.cpp
+++ b/engines/gob/demos/scnplayer.cpp
@@ -26,7 +26,7 @@
#include "common/endian.h"
#include "gob/gob.h"
-#include "gob/scnplayer.h"
+#include "gob/demos/scnplayer.h"
#include "gob/global.h"
#include "gob/util.h"
#include "gob/draw.h"
diff --git a/engines/gob/scnplayer.h b/engines/gob/demos/scnplayer.h
index a9973e7b20..752e3714c7 100644
--- a/engines/gob/scnplayer.h
+++ b/engines/gob/demos/scnplayer.h
@@ -30,7 +30,7 @@
#include "common/str.h"
#include "common/hashmap.h"
-#include "demoplayer.h"
+#include "gob/demos/demoplayer.h"
namespace Gob {
diff --git a/engines/gob/init.cpp b/engines/gob/init.cpp
index fcc24875cd..f1af92f773 100644
--- a/engines/gob/init.cpp
+++ b/engines/gob/init.cpp
@@ -36,8 +36,8 @@
#include "gob/inter.h"
#include "gob/video.h"
#include "gob/videoplayer.h"
-#include "gob/scnplayer.h"
-#include "gob/batplayer.h"
+#include "gob/demos/scnplayer.h"
+#include "gob/demos/batplayer.h"
#include "gob/sound/sound.h"
namespace Gob {
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index e4f639a9d6..f1c8169b3c 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -56,15 +56,15 @@ MODULE_OBJS := \
scenery.o \
scenery_v1.o \
scenery_v2.o \
- demoplayer.o \
- scnplayer.o \
- batplayer.o \
util.o \
variables.o \
video.o \
video_v1.o \
video_v2.o \
video_v6.o \
+ demos/demoplayer.o \
+ demos/scnplayer.o \
+ demos/batplayer.o \
sound/sound.o \
sound/sounddesc.o \
sound/pcspeaker.o \