aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/include
diff options
context:
space:
mode:
authorFilippos Karapetis2009-02-21 18:46:03 +0000
committerFilippos Karapetis2009-02-21 18:46:03 +0000
commit9036c0fee0887f2567a3c04a2f29c95fc46d049d (patch)
tree1d39745becd8f870ff9a2770dd356249fc0a1dba /engines/sci/include
parent9f2c0dcc6f5c278fa06be8d0fdfaf69c27b40282 (diff)
downloadscummvm-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
Diffstat (limited to 'engines/sci/include')
-rw-r--r--engines/sci/include/engine.h2
-rw-r--r--engines/sci/include/kernel.h2
-rw-r--r--engines/sci/include/sciconsole.h (renamed from engines/sci/include/console.h)0
3 files changed, 2 insertions, 2 deletions
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