[Scummvm-cvs-logs] SF.net SVN: scummvm:[43459] scummvm/trunk/engines/sci

[lordhoto at users.sourceforge.net]

Revision: 43459
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43459&view=rev
Author:   lordhoto
Date:     2009-08-17 07:36:08 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.h
    scummvm/trunk/engines/sci/debug.h
    scummvm/trunk/engines/sci/engine/kernel.h
    scummvm/trunk/engines/sci/engine/memobj.h
    scummvm/trunk/engines/sci/engine/vm.h
    scummvm/trunk/engines/sci/gfx/gfx_state_internal.h
    scummvm/trunk/engines/sci/gfx/gfx_widgets.h
    scummvm/trunk/engines/sci/resource.h

Modified: scummvm/trunk/engines/sci/console.h
===================================================================
--- scummvm/trunk/engines/sci/console.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/console.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -29,6 +29,7 @@
 #define SCI_CONSOLE_H
 
 #include "gui/debugger.h"
+#include "sci/engine/vm.h"
 
 namespace Sci {
 

Modified: scummvm/trunk/engines/sci/debug.h
===================================================================
--- scummvm/trunk/engines/sci/debug.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/debug.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -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 {

Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/engine/kernel.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -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 {
 

Modified: scummvm/trunk/engines/sci/engine/memobj.h
===================================================================
--- scummvm/trunk/engines/sci/engine/memobj.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/engine/memobj.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -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"

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -41,7 +41,6 @@
 struct IntMapper;
 struct Object;
 class ResourceManager;
-extern enum SciVersion;
 
 /** Number of bytes to be allocated for the stack */
 #define VM_STACK_SIZE 0x1000

Modified: scummvm/trunk/engines/sci/gfx/gfx_state_internal.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_state_internal.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/gfx/gfx_state_internal.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -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"

Modified: scummvm/trunk/engines/sci/gfx/gfx_widgets.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_widgets.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/gfx/gfx_widgets.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -29,6 +29,7 @@
 
 #include "common/rect.h"
 
+#include "sci/engine/vm.h"
 #include "sci/gfx/gfx_system.h"
 #include "sci/gfx/operations.h"
 

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2009-08-17 05:55:21 UTC (rev 43458)
+++ scummvm/trunk/engines/sci/resource.h	2009-08-17 07:36:08 UTC (rev 43459)
@@ -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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.