aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ds/arm9/source
diff options
context:
space:
mode:
authorAndre Heider2010-09-04 22:26:12 +0000
committerAndre Heider2010-09-04 22:26:12 +0000
commit9c495a23b26dce79e0a95ed06d3a98956f68ca64 (patch)
tree5ee26ea6ceaef0299de52320d8d1035b475157ec /backends/platform/ds/arm9/source
parentff1b64937aa7663dd02ef7582d8655a1c31f5abb (diff)
downloadscummvm-rg350-9c495a23b26dce79e0a95ed06d3a98956f68ca64.tar.gz
scummvm-rg350-9c495a23b26dce79e0a95ed06d3a98956f68ca64.tar.bz2
scummvm-rg350-9c495a23b26dce79e0a95ed06d3a98956f68ca64.zip
DS: Merge r52533 from trunk.
svn-id: r52534
Diffstat (limited to 'backends/platform/ds/arm9/source')
-rw-r--r--backends/platform/ds/arm9/source/dsmain.cpp4
-rw-r--r--backends/platform/ds/arm9/source/portdefs.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index 4c7d6b89ae..0d0b88778b 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -3232,6 +3232,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