aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/scicore
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/scicore')
-rw-r--r--engines/sci/scicore/aatree.c4
-rw-r--r--engines/sci/scicore/decompress0.c4
-rw-r--r--engines/sci/scicore/decompress01.c4
-rw-r--r--engines/sci/scicore/decompress1.c4
-rw-r--r--engines/sci/scicore/decompress11.c4
-rw-r--r--engines/sci/scicore/exe.c6
-rw-r--r--engines/sci/scicore/exe_lzexe.c4
-rw-r--r--engines/sci/scicore/exe_raw.c4
-rw-r--r--engines/sci/scicore/int_hashmap.c4
-rw-r--r--engines/sci/scicore/reg_t_hashmap.c4
-rw-r--r--engines/sci/scicore/resource.c6
-rw-r--r--engines/sci/scicore/resource_map.c6
-rw-r--r--engines/sci/scicore/resource_patch.c4
-rw-r--r--engines/sci/scicore/sci_memory.c2
-rw-r--r--engines/sci/scicore/script.c4
-rw-r--r--engines/sci/scicore/tools.c2
-rw-r--r--engines/sci/scicore/versions.c10
-rw-r--r--engines/sci/scicore/vocab.c6
-rw-r--r--engines/sci/scicore/vocab_debug.c4
19 files changed, 43 insertions, 43 deletions
diff --git a/engines/sci/scicore/aatree.c b/engines/sci/scicore/aatree.c
index 74c8f6519e..7bbef8c43b 100644
--- a/engines/sci/scicore/aatree.c
+++ b/engines/sci/scicore/aatree.c
@@ -26,9 +26,9 @@
***************************************************************************/
#include <stdlib.h>
-#include <aatree.h>
+#include "sci/include/aatree.h"
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
struct aatree
{
diff --git a/engines/sci/scicore/decompress0.c b/engines/sci/scicore/decompress0.c
index 00c98e03df..6dba2d5299 100644
--- a/engines/sci/scicore/decompress0.c
+++ b/engines/sci/scicore/decompress0.c
@@ -28,8 +28,8 @@
** This is for SCI version 0 style compression.
*/
-#include <sci_memory.h>
-#include <sciresource.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
/* #define _SCI_DECOMPRESS_DEBUG */
diff --git a/engines/sci/scicore/decompress01.c b/engines/sci/scicore/decompress01.c
index 69795b1c6d..e08e98f95b 100644
--- a/engines/sci/scicore/decompress01.c
+++ b/engines/sci/scicore/decompress01.c
@@ -26,8 +26,8 @@
***************************************************************************/
/* Reads data from a resource file and stores the result in memory */
-#include <sci_memory.h>
-#include <sciresource.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
/***************************************************************************
* The following code was originally created by Carl Muckenhoupt for his
diff --git a/engines/sci/scicore/decompress1.c b/engines/sci/scicore/decompress1.c
index 978a00bf86..be88d775aa 100644
--- a/engines/sci/scicore/decompress1.c
+++ b/engines/sci/scicore/decompress1.c
@@ -26,8 +26,8 @@
***************************************************************************/
/* Reads data from a resource file and stores the result in memory */
-#include <sci_memory.h>
-#include <sciresource.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
diff --git a/engines/sci/scicore/decompress11.c b/engines/sci/scicore/decompress11.c
index eb3cc39a73..88f3a2795a 100644
--- a/engines/sci/scicore/decompress11.c
+++ b/engines/sci/scicore/decompress11.c
@@ -26,8 +26,8 @@
***************************************************************************/
/* Reads data from a resource file and stores the result in memory */
-#include <sci_memory.h>
-#include <sciresource.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
#define DDEBUG if (0) printf
diff --git a/engines/sci/scicore/exe.c b/engines/sci/scicore/exe.c
index d2ff72995a..4e97f80ed5 100644
--- a/engines/sci/scicore/exe.c
+++ b/engines/sci/scicore/exe.c
@@ -25,10 +25,10 @@
***************************************************************************/
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
-#include "exe.h"
-#include "exe_dec.h"
+#include "sci/scicore/exe.h"
+#include "sci/scicore/exe_dec.h"
extern exe_decompressor_t exe_decompressor_lzexe;
extern exe_decompressor_t exe_decompressor_raw;
diff --git a/engines/sci/scicore/exe_lzexe.c b/engines/sci/scicore/exe_lzexe.c
index 2331c01fb4..4445ed8df9 100644
--- a/engines/sci/scicore/exe_lzexe.c
+++ b/engines/sci/scicore/exe_lzexe.c
@@ -28,8 +28,8 @@
/* Based on public domain code by Mitugu Kurizono. */
#include <stdio.h>
-#include <sci_memory.h>
-#include "exe_dec.h"
+#include "sci/include/sci_memory.h"
+#include "sci/scicore/exe_dec.h"
/* Macro to interpret two sequential bytes as an unsigned integer. */
#define UINT16(A) ((*((A) + 1) << 8) + *(A))
diff --git a/engines/sci/scicore/exe_raw.c b/engines/sci/scicore/exe_raw.c
index ecc7089b2a..9a0dc5f742 100644
--- a/engines/sci/scicore/exe_raw.c
+++ b/engines/sci/scicore/exe_raw.c
@@ -26,14 +26,14 @@
***************************************************************************/
#include <stdio.h>
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
struct _exe_handle
{
FILE *f;
};
-#include "exe_dec.h"
+#include "sci/scicore/exe_dec.h"
static exe_handle_t *
raw_open(const char *filename)
diff --git a/engines/sci/scicore/int_hashmap.c b/engines/sci/scicore/int_hashmap.c
index 0b70838e17..d170afd3d5 100644
--- a/engines/sci/scicore/int_hashmap.c
+++ b/engines/sci/scicore/int_hashmap.c
@@ -26,8 +26,8 @@
***************************************************************************/
#define BUILD_MAP_FUNCTIONS
-#include "int_hashmap.h"
+#include "sci/include/int_hashmap.h"
-#include "hashmap.c"
+#include "sci/scicore/hashmap.c"
DEFINE_FUNCTIONS(int)
diff --git a/engines/sci/scicore/reg_t_hashmap.c b/engines/sci/scicore/reg_t_hashmap.c
index 0ac8382422..bee5a8bcf2 100644
--- a/engines/sci/scicore/reg_t_hashmap.c
+++ b/engines/sci/scicore/reg_t_hashmap.c
@@ -26,9 +26,9 @@
***************************************************************************/
#define BUILD_MAP_FUNCTIONS
-#include "reg_t_hashmap.h"
+#include "sci/include/reg_t_hashmap.h"
-#include "hashmap.c"
+#include "sci/scicore/hashmap.c"
static inline int
compare_reg_t (reg_t lhs, reg_t rhs)
diff --git a/engines/sci/scicore/resource.c b/engines/sci/scicore/resource.c
index b137790f89..e131b55606 100644
--- a/engines/sci/scicore/resource.c
+++ b/engines/sci/scicore/resource.c
@@ -30,9 +30,9 @@
***************************************************************************/
/* Resource library */
-#include <sci_memory.h>
-#include <sciresource.h>
-#include <vocabulary.h> /* For SCI version auto-detection */
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/vocabulary.h" /* For SCI version auto-detection */
#include <ctype.h>
diff --git a/engines/sci/scicore/resource_map.c b/engines/sci/scicore/resource_map.c
index 5a85383911..48ea54cb3a 100644
--- a/engines/sci/scicore/resource_map.c
+++ b/engines/sci/scicore/resource_map.c
@@ -25,9 +25,9 @@
***************************************************************************/
-#include <sci_memory.h>
-#include <sciresource.h>
-#include <resource.h>
+#include "sci/include/sci_memory.h"
+#include "sci/include/sciresource.h"
+#include "sci/include/resource.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
diff --git a/engines/sci/scicore/resource_patch.c b/engines/sci/scicore/resource_patch.c
index 3de384e25b..1cdaeb503d 100644
--- a/engines/sci/scicore/resource_patch.c
+++ b/engines/sci/scicore/resource_patch.c
@@ -26,8 +26,8 @@
***************************************************************************/
-#include <sciresource.h>
-#include <sci_memory.h>
+#include "sci/include/sciresource.h"
+#include "sci/include/sci_memory.h"
void
diff --git a/engines/sci/scicore/sci_memory.c b/engines/sci/scicore/sci_memory.c
index ba666e1ceb..4d0395d9dd 100644
--- a/engines/sci/scicore/sci_memory.c
+++ b/engines/sci/scicore/sci_memory.c
@@ -33,7 +33,7 @@
***************************************************************************/
-#include <sci_memory.h>
+#include "sci/include/sci_memory.h"
/*#define POISON_MEMORY*/
diff --git a/engines/sci/scicore/script.c b/engines/sci/scicore/script.c
index 921e0fa50b..b3d977e5ad 100644
--- a/engines/sci/scicore/script.c
+++ b/engines/sci/scicore/script.c
@@ -27,8 +27,8 @@
***************************************************************************/
-#include <sciresource.h>
-#include <engine.h>
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
/* #define SCRIPT_DEBUG */
diff --git a/engines/sci/scicore/tools.c b/engines/sci/scicore/tools.c
index 4194a44047..11bc00d5a7 100644
--- a/engines/sci/scicore/tools.c
+++ b/engines/sci/scicore/tools.c
@@ -27,7 +27,7 @@
#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */
#include <stdlib.h>
-#include <engine.h>
+#include "sci/include/engine.h"
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
diff --git a/engines/sci/scicore/versions.c b/engines/sci/scicore/versions.c
index 06cab77cd1..6b6e1ef0ee 100644
--- a/engines/sci/scicore/versions.c
+++ b/engines/sci/scicore/versions.c
@@ -19,12 +19,12 @@
***************************************************************************/
#define NEED_SCI_VERSIONS
-#include <versions.h>
-#include <engine.h>
-#include <resource.h>
+#include "sci/include/versions.h"
+#include "sci/include/engine.h"
+#include "sci/include/resource.h"
#include <ctype.h>
-#include "games.h"
-#include "exe.h"
+#include "sci/scicore/games.h"
+#include "sci/scicore/exe.h"
/* Maxmimum number of bytes to hash from start of file */
#define VERSION_DETECT_HASH_SIZE 1000000
diff --git a/engines/sci/scicore/vocab.c b/engines/sci/scicore/vocab.c
index dd70cc2fbe..c712fdf4b5 100644
--- a/engines/sci/scicore/vocab.c
+++ b/engines/sci/scicore/vocab.c
@@ -27,9 +27,9 @@
/* Main vocabulary support functions and word lookup */
-#include <sciresource.h>
-#include <engine.h>
-#include <kernel.h>
+#include "sci/include/sciresource.h"
+#include "sci/include/engine.h"
+#include "sci/include/kernel.h"
#include <ctype.h>
diff --git a/engines/sci/scicore/vocab_debug.c b/engines/sci/scicore/vocab_debug.c
index 1877037040..6e22320ee2 100644
--- a/engines/sci/scicore/vocab_debug.c
+++ b/engines/sci/scicore/vocab_debug.c
@@ -4,8 +4,8 @@
#include <string.h>
-#include <engine.h>
-#include <sciresource.h>
+#include "sci/include/engine.h"
+#include "sci/include/sciresource.h"
/* Default kernel name table */
#define SCI0_KNAMES_WELL_DEFINED 0x6e