aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds
diff options
context:
space:
mode:
authorAndre Heider2010-09-04 22:19:20 +0000
committerAndre Heider2010-09-04 22:19:20 +0000
commit7248efb178cdb33c107cc0ff183eb74c79236a59 (patch)
tree1c243f93c67734981911ef9fac61f85d772033f0 /backends/platform/ds
parentaa5cd3e6825f50e574804455e6b5a3fbe2070062 (diff)
downloadscummvm-rg350-7248efb178cdb33c107cc0ff183eb74c79236a59.tar.gz
scummvm-rg350-7248efb178cdb33c107cc0ff183eb74c79236a59.tar.bz2
scummvm-rg350-7248efb178cdb33c107cc0ff183eb74c79236a59.zip
DS: Enable stdout/err via nocash when DISABLE_COMMAND_LINE in not set.
svn-id: r52533
Diffstat (limited to 'backends/platform/ds')
-rw-r--r--backends/platform/ds/arm9/makefile2
-rw-r--r--backends/platform/ds/arm9/source/dsmain.cpp4
-rw-r--r--backends/platform/ds/arm9/source/portdefs.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index eedf75c256..42cc6b13c9 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -236,7 +236,7 @@ CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder \
ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
ifdef USE_MAD
DEFINES += -DUSE_MAD
endif
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 95bfdfe40a..1525647c2e 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -3227,6 +3227,10 @@ int main(void) {
int main() {
+#ifndef DISABLE_TEXT_CONSOLE
+ consoleDebugInit(DebugDevice_NOCASH);
+ nocashMessage("startup\n");
+#endif
DS::main();
}
diff --git a/backends/platform/ds/arm9/source/portdefs.h b/backends/platform/ds/arm9/source/portdefs.h
index cc38d66a73..ad36503e83 100644
--- a/backends/platform/ds/arm9/source/portdefs.h
+++ b/backends/platform/ds/arm9/source/portdefs.h
@@ -40,10 +40,6 @@
#define double float
-#ifndef DISABLE_TEXT_CONSOLE
-#define DISABLE_TEXT_CONSOLE
-#endif
-
#ifndef DISABLE_COMMAND_LINE
#define DISABLE_COMMAND_LINE
#endif