diff options
| author | Filippos Karapetis | 2009-02-21 18:46:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-02-21 18:46:03 +0000 |
| commit | 9036c0fee0887f2567a3c04a2f29c95fc46d049d (patch) | |
| tree | 1d39745becd8f870ff9a2770dd356249fc0a1dba | |
| parent | 9f2c0dcc6f5c278fa06be8d0fdfaf69c27b40282 (diff) | |
| download | scummvm-rg350-9036c0fee0887f2567a3c04a2f29c95fc46d049d.tar.gz scummvm-rg350-9036c0fee0887f2567a3c04a2f29c95fc46d049d.tar.bz2 scummvm-rg350-9036c0fee0887f2567a3c04a2f29c95fc46d049d.zip | |
Renamed SCI's console to sciconsole (MSVC has problems with files with the same name under different directories). ScummVM's console can be enabled correctly under MSVC now
svn-id: r38722
| -rw-r--r-- | engines/sci/engine/grammar.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/heap.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/include/engine.h | 2 | ||||
| -rw-r--r-- | engines/sci/include/kernel.h | 2 | ||||
| -rw-r--r-- | engines/sci/include/sciconsole.h (renamed from engines/sci/include/console.h) | 0 | ||||
| -rw-r--r-- | engines/sci/module.mk | 2 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/scicore/sciconsole.cpp (renamed from engines/sci/scicore/console.cpp) | 0 |
9 files changed, 7 insertions, 8 deletions
diff --git a/engines/sci/engine/grammar.cpp b/engines/sci/engine/grammar.cpp index a06464a0b4..5d72dcd8ad 100644 --- a/engines/sci/engine/grammar.cpp +++ b/engines/sci/engine/grammar.cpp @@ -30,7 +30,7 @@ #include "sci/tools.h" #include "sci/include/vocabulary.h" -#include "sci/include/console.h" +#include "sci/include/sciconsole.h" namespace Sci { diff --git a/engines/sci/engine/heap.cpp b/engines/sci/engine/heap.cpp index 925cbb8905..159d003c56 100644 --- a/engines/sci/engine/heap.cpp +++ b/engines/sci/engine/heap.cpp @@ -24,7 +24,7 @@ */ #include "sci/include/engine.h" -#include "sci/include/console.h" +#include "sci/include/sciconsole.h" #include "sci/engine/heap.h" namespace Sci { diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index f67b513764..e23463ec19 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -49,7 +49,7 @@ #include "sci/engine/gc.h" #include "sci/include/sciresource.h" #include "sci/include/engine.h" -#include "sci/include/console.h" +#include "sci/include/sciconsole.h" #include "sci/include/kdebug.h" #include "sci/include/vocabulary.h" #include "sci/engine/kernel_types.h" diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h index 2abcf2f4da..d6e54460a8 100644 --- a/engines/sci/include/engine.h +++ b/engines/sci/include/engine.h @@ -37,7 +37,7 @@ namespace Common { #include "sci/include/sciresource.h" #include "sci/include/script.h" #include "sci/include/vocabulary.h" -#include "sci/include/console.h" +#include "sci/include/sciconsole.h" #include "sci/include/vm.h" #include "sci/include/menubar.h" #include "sci/include/versions.h" diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h index d28fe62250..e8b7c39ca4 100644 --- a/engines/sci/include/kernel.h +++ b/engines/sci/include/kernel.h @@ -33,7 +33,7 @@ #include "sci/include/uinput.h" #include "sci/include/event.h" #include "sci/include/vm.h" -#include "sci/include/console.h" /* sciprintf() */ +#include "sci/include/sciconsole.h" /* sciprintf() */ namespace Sci { diff --git a/engines/sci/include/console.h b/engines/sci/include/sciconsole.h index 7e0ad876c4..7e0ad876c4 100644 --- a/engines/sci/include/console.h +++ b/engines/sci/include/sciconsole.h diff --git a/engines/sci/module.mk b/engines/sci/module.mk index be8d7374a4..6e6c73716f 100644 --- a/engines/sci/module.mk +++ b/engines/sci/module.mk @@ -53,7 +53,7 @@ MODULE_OBJS = \ gfx/resource/sci_view_0.o \ gfx/resource/sci_view_1.o \ scicore/aatree.o \ - scicore/console.o \ + scicore/sciconsole.o \ scicore/decompress0.o \ scicore/decompress01.o \ scicore/decompress1.o \ diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index ff1a51f22a..17a9f5114a 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -173,8 +173,7 @@ Common::Error SciEngine::init() { initGraphics(320, 200, false); // Create debugger console. It requires GFX to be initialized - // FIXME: Enabling this leads to an unresolved external symbol during linking... - //_console = new Console(this); + _console = new Console(this); // Additional setup. printf("SciEngine::init\n"); diff --git a/engines/sci/scicore/console.cpp b/engines/sci/scicore/sciconsole.cpp index 8db1b930fb..8db1b930fb 100644 --- a/engines/sci/scicore/console.cpp +++ b/engines/sci/scicore/sciconsole.cpp |