SCI: Moved scicore/tools.cpp to tools.cpp, and include/resource.h to tools.h

svn-id: r38720

22 files changed, 26 insertions, 23 deletions

diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp
index c478d6c1c9..a06464a0b4 100644
--- a/engines/sci/engine/grammar.cpp
+++ b/engines/sci/engine/grammar.cpp
@@ -28,7 +28,7 @@
 ** that grammar, writing an appropriate node tree if successful.
 */
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/vocabulary.h"
 #include "sci/include/console.h"
 
diff --git a/engines/sci/engine/heap.h b/engines/sci/engine/heap.h
index 5fd745d547..37a7134517 100644
--- a/engines/sci/engine/heap.h
+++ b/engines/sci/engine/heap.h
@@ -26,7 +26,7 @@
 #ifndef _SCI_HEAP_H
 #define _SCI_HEAP_H
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/console.h b/engines/sci/include/console.h
index a12cfcdf2a..7e0ad876c4 100644
--- a/engines/sci/include/console.h
+++ b/engines/sci/include/console.h
@@ -35,7 +35,7 @@
 #include "common/scummsys.h"
 
 #include "sci/include/sci_memory.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/vm_types.h"
 
 #define SCI_CONSOLE
diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h
index b4fbc62817..aed9040ac5 100644
--- a/engines/sci/include/engine.h
+++ b/engines/sci/include/engine.h
@@ -36,14 +36,16 @@ namespace Common {
 // FIXME. Remove after transiton to File class
 #include <sys/stat.h>
 
-#include "sci/include/resource.h"
+// FIXME. Remove this eventually
+#include <time.h>
+
+#include "sci/tools.h"
 #include "sci/include/sciresource.h"
 #include "sci/include/script.h"
 #include "sci/include/vocabulary.h"
 #include "sci/include/console.h"
 #include "sci/include/vm.h"
 #include "sci/include/menubar.h"
-#include <time.h>
 #include "sci/include/versions.h"
 #include "sci/include/kernel.h"
 #include "sci/include/gfx_state_internal.h"
diff --git a/engines/sci/include/gfx_system.h b/engines/sci/include/gfx_system.h
index d3f7397043..93cf00d5d5 100644
--- a/engines/sci/include/gfx_system.h
+++ b/engines/sci/include/gfx_system.h
@@ -29,7 +29,7 @@
 #include "common/scummsys.h"
 #include "common/rect.h"
 #include "sci/include/sci_memory.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/include/heapmgr.h b/engines/sci/include/heapmgr.h
index dff2e9fc12..918a6a07fa 100644
--- a/engines/sci/include/heapmgr.h
+++ b/engines/sci/include/heapmgr.h
@@ -28,7 +28,7 @@
 #ifndef _FREESCI_HEAPMGR_H_
 #define _FREESCI_HEAPMGR_H_
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/sci_memory.h"
 
 namespace Sci {
diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h
index ff09b4b1b6..c39b6c86fe 100644
--- a/engines/sci/include/sci_memory.h
+++ b/engines/sci/include/sci_memory.h
@@ -44,8 +44,9 @@
 #define _SCI_MEMORY_H
 
 #include "common/scummsys.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
+// FIXME: Get rid of the following #include
 #ifdef _MSC_VER
 #  include <direct.h> // for chdir, rmdir, _gecwd, getcwd, mkdir
 #endif
diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h
index aa280657ca..67205665b5 100644
--- a/engines/sci/include/sciresource.h
+++ b/engines/sci/include/sciresource.h
@@ -32,7 +32,7 @@
 #include "common/stream.h"
 #include "common/str.h"
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/versions.h"
 
 namespace Sci {
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 2dccaad01d..75293d6d7d 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -5,6 +5,7 @@ MODULE_OBJS = \
 	detection.o \
 	exereader.o \
 	sci.o \
+	tools.o \
 	engine/game.o \
 	engine/gc.o \
 	engine/grammar.o \
@@ -62,7 +63,6 @@ MODULE_OBJS = \
 	scicore/resource_patch.o \
 	scicore/sci_memory.o \
 	scicore/script.o \
-	scicore/tools.o \
 	scicore/versions.o \
 	scicore/vocab.o \
 	scicore/vocab_debug.o \
diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp
index dd44dabfcb..c30525584a 100644
--- a/engines/sci/scicore/resource_map.cpp
+++ b/engines/sci/scicore/resource_map.cpp
@@ -25,7 +25,7 @@
 
 #include "sci/include/sci_memory.h"
 #include "sci/include/sciresource.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 #include "common/file.h"
 
diff --git a/engines/sci/scicore/versions.cpp b/engines/sci/scicore/versions.cpp
index 8706a5d54b..54bcc5acff 100644
--- a/engines/sci/scicore/versions.cpp
+++ b/engines/sci/scicore/versions.cpp
@@ -30,7 +30,7 @@
 
 #include "sci/include/versions.h"
 #include "sci/include/engine.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/adlib.h b/engines/sci/sfx/adlib.h
index 890f573cdf..01f6624cdf 100644
--- a/engines/sci/sfx/adlib.h
+++ b/engines/sci/sfx/adlib.h
@@ -27,7 +27,7 @@
 #ifndef _SFX_ADLIB_H_
 #define _SFX_ADLIB_H_
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/device/devices.cpp b/engines/sci/sfx/device/devices.cpp
index defa5bcef3..c15c6e03a2 100644
--- a/engines/sci/sfx/device/devices.cpp
+++ b/engines/sci/sfx/device/devices.cpp
@@ -29,7 +29,7 @@
 #include "../device.h"
 #include <stdio.h>
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp
index 5c6c3cb474..7c98e6d691 100644
--- a/engines/sci/sfx/iterator.cpp
+++ b/engines/sci/sfx/iterator.cpp
@@ -29,7 +29,7 @@
 #include "common/util.h"
 #include "sci/include/sfx_iterator_internal.h"
 #include "sci/include/sfx_player.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/sci_memory.h"
 
 namespace Sci {
diff --git a/engines/sci/sfx/pcm-iterator.cpp b/engines/sci/sfx/pcm-iterator.cpp
index abb42bc7a7..9c72edfa13 100644
--- a/engines/sci/sfx/pcm-iterator.cpp
+++ b/engines/sci/sfx/pcm-iterator.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/include/sfx_iterator.h"
-#include "sci/include/resource.h" /* for BREAKPOINT */
+#include "sci/tools.h" /* for BREAKPOINT */
 #include "sci/include/sci_memory.h"
 
 namespace Sci {
diff --git a/engines/sci/sfx/seq/sequencers.cpp b/engines/sci/sfx/seq/sequencers.cpp
index ce73beab0f..1a0cd68c2d 100644
--- a/engines/sci/sfx/seq/sequencers.cpp
+++ b/engines/sci/sfx/seq/sequencers.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "../sequencer.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/softseq.h b/engines/sci/sfx/softseq.h
index 39cb73e4e7..71b296fda6 100644
--- a/engines/sci/sfx/softseq.h
+++ b/engines/sci/sfx/softseq.h
@@ -29,7 +29,7 @@
 #include "sci/include/sfx_core.h"
 #include "sci/include/sfx_pcm.h"
 #include "sci/sfx/sequencer.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sfx/softseq/amiga.cpp
index 4ceb0d311e..643d3092bd 100644
--- a/engines/sci/sfx/softseq/amiga.cpp
+++ b/engines/sci/sfx/softseq/amiga.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/sci_memory.h"
 #include "sci/sfx/softseq.h"
 
diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp
index 2986917b7a..1de9bd4659 100644
--- a/engines/sci/sfx/softseq/opl2.cpp
+++ b/engines/sci/sfx/softseq/opl2.cpp
@@ -42,7 +42,7 @@
 
 ***************************************************************************/
 
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 #include "sci/include/sfx_iterator.h"
 #include "../softseq.h"
 #include "../adlib.h"
diff --git a/engines/sci/sfx/time.cpp b/engines/sci/sfx/time.cpp
index 42af86dacf..418343584a 100644
--- a/engines/sci/sfx/time.cpp
+++ b/engines/sci/sfx/time.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sci/include/sfx_time.h"
-#include "sci/include/resource.h"
+#include "sci/tools.h"
 
 namespace Sci {
 
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/tools.cpp
index b1d0829bd6..b1d0829bd6 100644
--- a/engines/sci/scicore/tools.cpp
+++ b/engines/sci/tools.cpp
diff --git a/engines/sci/include/resource.h b/engines/sci/tools.h
index 5972cf2553..9f84ee8cd1 100644
--- a/engines/sci/include/resource.h
+++ b/engines/sci/tools.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef FREESCI_PRIMARY_RESOURCE_H_
-#define FREESCI_PRIMARY_RESOURCE_H_
+#ifndef SCI_TOOLS_H
+#define SCI_TOOLS_H
 
 #include "common/scummsys.h"