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
This commit is contained in:
parent
4a1080a597
commit
6f45ecff1a
5 changed files with 4 additions and 4 deletions
|
@ -26,7 +26,7 @@
|
||||||
#define COMMON_DEBUG_H
|
#define COMMON_DEBUG_H
|
||||||
|
|
||||||
#include "common/scummsys.h"
|
#include "common/scummsys.h"
|
||||||
#include "common/console.h"
|
#include "common/textconsole.h"
|
||||||
#include "common/list.h"
|
#include "common/list.h"
|
||||||
#include "common/str.h"
|
#include "common/str.h"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ MODULE_OBJS := \
|
||||||
archive.o \
|
archive.o \
|
||||||
config-file.o \
|
config-file.o \
|
||||||
config-manager.o \
|
config-manager.o \
|
||||||
console.o \
|
textconsole.o \
|
||||||
debug.o \
|
debug.o \
|
||||||
EventDispatcher.o \
|
EventDispatcher.o \
|
||||||
EventRecorder.o \
|
EventRecorder.o \
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
* $Id$
|
* $Id$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common/console.h"
|
#include "common/textconsole.h"
|
||||||
#include "common/system.h"
|
#include "common/system.h"
|
||||||
|
|
||||||
namespace Common {
|
namespace Common {
|
|
@ -26,7 +26,7 @@
|
||||||
#define COMMON_UTIL_H
|
#define COMMON_UTIL_H
|
||||||
|
|
||||||
#include "common/scummsys.h"
|
#include "common/scummsys.h"
|
||||||
#include "common/console.h"
|
#include "common/textconsole.h"
|
||||||
#include "common/str.h"
|
#include "common/str.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue