diff options
| author | Filippos Karapetis | 2009-11-26 10:59:46 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-11-26 10:59:46 +0000 |
| commit | 6f45ecff1a260ef404c6f30a5866d2130e9815de (patch) | |
| tree | aa6a748bd2ecb46f92e4a279fca23366772232f7 | |
| parent | 4a1080a597fff9f572037143030d961c7e8652e5 (diff) | |
| download | scummvm-rg350-6f45ecff1a260ef404c6f30a5866d2130e9815de.tar.gz scummvm-rg350-6f45ecff1a260ef404c6f30a5866d2130e9815de.tar.bz2 scummvm-rg350-6f45ecff1a260ef404c6f30a5866d2130e9815de.zip | |
Renamed common/console.* to common/textconsole.* to fix compilation under MSVC again (broken with commit #46130). MSVC places all object files for each engine in the same folder (even if they're in subfolders), which resulted in clashing between gui/console.* and common/console.*. There's no easy way around this, other than turning the resulting MSVC files into a big mess, so a simple file rename is more feasible
svn-id: r46151
| -rw-r--r-- | common/debug.h | 2 | ||||
| -rw-r--r-- | common/module.mk | 2 | ||||
| -rw-r--r-- | common/textconsole.cpp (renamed from common/console.cpp) | 2 | ||||
| -rw-r--r-- | common/textconsole.h (renamed from common/console.h) | 0 | ||||
| -rw-r--r-- | common/util.h | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/common/debug.h b/common/debug.h index c84bc7d8af..488f0951d4 100644 --- a/common/debug.h +++ b/common/debug.h @@ -26,7 +26,7 @@ #define COMMON_DEBUG_H #include "common/scummsys.h" -#include "common/console.h" +#include "common/textconsole.h" #include "common/list.h" #include "common/str.h" diff --git a/common/module.mk b/common/module.mk index bc8e2b5b86..a619b5c54f 100644 --- a/common/module.mk +++ b/common/module.mk @@ -4,7 +4,7 @@ MODULE_OBJS := \ archive.o \ config-file.o \ config-manager.o \ - console.o \ + textconsole.o \ debug.o \ EventDispatcher.o \ EventRecorder.o \ diff --git a/common/console.cpp b/common/textconsole.cpp index cce478b58a..22e4119084 100644 --- a/common/console.cpp +++ b/common/textconsole.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/console.h" +#include "common/textconsole.h" #include "common/system.h" namespace Common { diff --git a/common/console.h b/common/textconsole.h index cff0dad55b..cff0dad55b 100644 --- a/common/console.h +++ b/common/textconsole.h diff --git a/common/util.h b/common/util.h index 986fb1cc4e..93ce2f2989 100644 --- a/common/util.h +++ b/common/util.h @@ -26,7 +26,7 @@ #define COMMON_UTIL_H #include "common/scummsys.h" -#include "common/console.h" +#include "common/textconsole.h" #include "common/str.h" |