aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-02-21 22:54:15 +0000
committerMax Horn2009-02-21 22:54:15 +0000
commit7a12a67ce8ed7be60670338e68d2e211f1ec070f (patch)
tree571f33b8fe1b2eddf7c54b434d9f8de730f2ff4d
parent6f13850161c75151a24356ab94b3d25b2fe9964c (diff)
downloadscummvm-rg350-7a12a67ce8ed7be60670338e68d2e211f1ec070f.tar.gz
scummvm-rg350-7a12a67ce8ed7be60670338e68d2e211f1ec070f.tar.bz2
scummvm-rg350-7a12a67ce8ed7be60670338e68d2e211f1ec070f.zip
SCI: Moved aatree.* files together into engine/
svn-id: r38763
-rw-r--r--engines/sci/engine/aatree.cpp (renamed from engines/sci/scicore/aatree.cpp)2
-rw-r--r--engines/sci/engine/aatree.h (renamed from engines/sci/include/aatree.h)0
-rw-r--r--engines/sci/engine/kpathing.cpp2
-rw-r--r--engines/sci/module.mk2
4 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/scicore/aatree.cpp b/engines/sci/engine/aatree.cpp
index 80552f6580..3cd3a01691 100644
--- a/engines/sci/scicore/aatree.cpp
+++ b/engines/sci/engine/aatree.cpp
@@ -23,7 +23,7 @@
*
*/
-#include "sci/include/aatree.h"
+#include "sci/engine/aatree.h"
#include "sci/include/sci_memory.h"
diff --git a/engines/sci/include/aatree.h b/engines/sci/engine/aatree.h
index f40c9e0935..f40c9e0935 100644
--- a/engines/sci/include/aatree.h
+++ b/engines/sci/engine/aatree.h
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index e61bee0391..b84ea704f0 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -28,7 +28,7 @@
*/
#include "sci/include/engine.h"
-#include "sci/include/aatree.h"
+#include "sci/engine/aatree.h"
#include "sci/include/list.h"
#include "sci/gfx/gfx_widgets.h"
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 00dfdbb0cf..c9bdd474a6 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -6,6 +6,7 @@ MODULE_OBJS = \
exereader.o \
sci.o \
tools.o \
+ engine/aatree.o \
engine/game.o \
engine/gc.o \
engine/grammar.o \
@@ -52,7 +53,6 @@ MODULE_OBJS = \
gfx/resource/sci_resmgr.o \
gfx/resource/sci_view_0.o \
gfx/resource/sci_view_1.o \
- scicore/aatree.o \
scicore/sciconsole.o \
scicore/decompress0.o \
scicore/decompress01.o \