From 7248efb178cdb33c107cc0ff183eb74c79236a59 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Sat, 4 Sep 2010 22:19:20 +0000
Subject: DS: Enable stdout/err via nocash when DISABLE_COMMAND_LINE in not
 set.

svn-id: r52533
---
 backends/fs/ds/ds-fs.cpp                    | 3 +++
 backends/platform/ds/arm9/makefile          | 2 +-
 backends/platform/ds/arm9/source/dsmain.cpp | 4 ++++
 backends/platform/ds/arm9/source/portdefs.h | 4 ----
 configure                                   | 3 ++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/backends/fs/ds/ds-fs.cpp b/backends/fs/ds/ds-fs.cpp
index 675084ff56..cbc1c054fe 100644
--- a/backends/fs/ds/ds-fs.cpp
+++ b/backends/fs/ds/ds-fs.cpp
@@ -631,7 +631,10 @@ size_t std_fwrite(const void *ptr, size_t size, size_t numItems, FILE *handle) {
 		return 0;
 
 	if ((handle == stderr) || (handle == stdout)) {
+#ifndef DISABLE_TEXT_CONSOLE
+		nocashMessage((char *) ptr);
 //		consolePrintf((char *) ptr);
+#endif
 		return size;
 	}
 
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
diff --git a/configure b/configure
index ab33fee136..d8d3c86e2d 100755
--- a/configure
+++ b/configure
@@ -1600,13 +1600,14 @@ if test -n "$_host"; then
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
 			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
 			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
-			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DDISABLE_COMMAND_LINE"
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
+			add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
 			_backend="ds"
 			_build_scalers=no
 			_mt32emu=no
-- 
cgit v1.2.3