[Scummvm-cvs-logs] SF.net SVN: scummvm:[52533] scummvm/trunk
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Sun Sep 5 00:19:20 CEST 2010
Revision: 52533
http://scummvm.svn.sourceforge.net/scummvm/?rev=52533&view=rev
Author: dhewg
Date: 2010-09-04 22:19:20 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
DS: Enable stdout/err via nocash when DISABLE_COMMAND_LINE in not set.
Modified Paths:
--------------
scummvm/trunk/backends/fs/ds/ds-fs.cpp
scummvm/trunk/backends/platform/ds/arm9/makefile
scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h
scummvm/trunk/configure
Modified: scummvm/trunk/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.cpp 2010-09-04 21:43:16 UTC (rev 52532)
+++ scummvm/trunk/backends/fs/ds/ds-fs.cpp 2010-09-04 22:19:20 UTC (rev 52533)
@@ -631,7 +631,10 @@
return 0;
if ((handle == stderr) || (handle == stdout)) {
+#ifndef DISABLE_TEXT_CONSOLE
+ nocashMessage((char *) ptr);
// consolePrintf((char *) ptr);
+#endif
return size;
}
Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile 2010-09-04 21:43:16 UTC (rev 52532)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile 2010-09-04 22:19:20 UTC (rev 52533)
@@ -236,7 +236,7 @@
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
Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp 2010-09-04 21:43:16 UTC (rev 52532)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp 2010-09-04 22:19:20 UTC (rev 52533)
@@ -3227,6 +3227,10 @@
int main() {
+#ifndef DISABLE_TEXT_CONSOLE
+ consoleDebugInit(DebugDevice_NOCASH);
+ nocashMessage("startup\n");
+#endif
DS::main();
}
Modified: scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h 2010-09-04 21:43:16 UTC (rev 52532)
+++ scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h 2010-09-04 22:19:20 UTC (rev 52533)
@@ -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
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2010-09-04 21:43:16 UTC (rev 52532)
+++ scummvm/trunk/configure 2010-09-04 22:19:20 UTC (rev 52533)
@@ -1600,13 +1600,14 @@
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list