diff options
| author | Johannes Schickel | 2009-08-17 07:36:08 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-17 07:36:08 +0000 |
| commit | 71c9700420237834d2e02a29eb6c0d0508a463b7 (patch) | |
| tree | 53e0107f45fb8ae01093f5636a16ace501223798 | |
| parent | c38f58598bfc35aa6c1a413e6f1369d5f09ca819 (diff) | |
| download | scummvm-rg350-71c9700420237834d2e02a29eb6c0d0508a463b7.tar.gz scummvm-rg350-71c9700420237834d2e02a29eb6c0d0508a463b7.tar.bz2 scummvm-rg350-71c9700420237834d2e02a29eb6c0d0508a463b7.zip | |
Fix compilation of the SCI engine. It seems that all of the SCI header files I touched (and probably others I luckily didn't touch) seem to assume that files including them will supply needed types. That looks like a major issue in SCI. Someone with knowledge of the SCI code should look into this and cleanup the includes of *all* SCI headers.
svn-id: r43459
| -rw-r--r-- | engines/sci/console.h | 1 | ||||
| -rw-r--r-- | engines/sci/debug.h | 3 | ||||
| -rw-r--r-- | engines/sci/engine/kernel.h | 2 | ||||
| -rw-r--r-- | engines/sci/engine/memobj.h | 1 | ||||
| -rw-r--r-- | engines/sci/engine/vm.h | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_state_internal.h | 1 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_widgets.h | 1 | ||||
| -rw-r--r-- | engines/sci/resource.h | 1 |
8 files changed, 9 insertions, 2 deletions
diff --git a/engines/sci/console.h b/engines/sci/console.h index 8d1299dd1e..032a2ff865 100644 --- a/engines/sci/console.h +++ b/engines/sci/console.h @@ -29,6 +29,7 @@ #define SCI_CONSOLE_H #include "gui/debugger.h" +#include "sci/engine/vm.h" namespace Sci { diff --git a/engines/sci/debug.h b/engines/sci/debug.h index a3c4fab372..e3bca1f0c1 100644 --- a/engines/sci/debug.h +++ b/engines/sci/debug.h @@ -26,6 +26,9 @@ #ifndef SCI_DEBUG_H #define SCI_DEBUG_H +#include "sci/engine/vm_types.h" // for StackPtr +#include "sci/engine/vm.h" // for ExecStack + namespace Sci { enum DebugSeeking { diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index 2c90728fb0..bb5563a876 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -32,6 +32,8 @@ #include "sci/uinput.h" #include "sci/vocabulary.h" +#include "sci/engine/vm_types.h" // for reg_t +#include "sci/engine/vm.h" namespace Sci { diff --git a/engines/sci/engine/memobj.h b/engines/sci/engine/memobj.h index 50c43a0e88..efe7f26f1c 100644 --- a/engines/sci/engine/memobj.h +++ b/engines/sci/engine/memobj.h @@ -27,6 +27,7 @@ #define SCI_ENGINE_MEMOBJ_H #include "common/serializer.h" +#include "sci/engine/vm.h" #include "sci/engine/vm_types.h" // for reg_t //#include "common/util.h" diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index 8be318811d..c8f94d5446 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -41,7 +41,6 @@ typedef int sci_version_t; struct IntMapper; struct Object; class ResourceManager; -extern enum SciVersion; /** Number of bytes to be allocated for the stack */ #define VM_STACK_SIZE 0x1000 diff --git a/engines/sci/gfx/gfx_state_internal.h b/engines/sci/gfx/gfx_state_internal.h index 3beb0ea067..1bff83e713 100644 --- a/engines/sci/gfx/gfx_state_internal.h +++ b/engines/sci/gfx/gfx_state_internal.h @@ -26,6 +26,7 @@ #ifndef SCI_GFX_GFX_STATE_INTERNAL_H #define SCI_GFX_GFX_STATE_INTERNAL_H +#include "sci/engine/vm.h" #include "sci/gfx/gfx_tools.h" #include "sci/gfx/gfx_options.h" #include "sci/gfx/operations.h" diff --git a/engines/sci/gfx/gfx_widgets.h b/engines/sci/gfx/gfx_widgets.h index 80129152cb..ace13ff1b9 100644 --- a/engines/sci/gfx/gfx_widgets.h +++ b/engines/sci/gfx/gfx_widgets.h @@ -29,6 +29,7 @@ #include "common/rect.h" +#include "sci/engine/vm.h" #include "sci/gfx/gfx_system.h" #include "sci/gfx/operations.h" diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 1ab49c834e..d38cff87df 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -33,7 +33,6 @@ #include "sound/audiostream.h" #include "sound/mixer.h" // for SoundHandle -#include "sci/engine/vm.h" // for Object #include "sci/decompressor.h" namespace Common { |