thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DS: Enable stdout/err via nocash when DISABLE_COMMAND_LINE in not set.

Browse source 
svn-id: r52533
This commit is contained in:
Andre Heider 2010-09-04 22:19:20 +00:00
parent aa5cd3e682
commit 7248efb178
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backends/fs/ds/ds-fs.cpp
View file

@ -631,7 +631,10 @@ size_t std_fwrite(const void *ptr, size_t size, size_t numItems, FILE *handle) {
return 0; return 0;
if ((handle == stderr) || (handle == stdout)) { if ((handle == stderr) || (handle == stdout)) {
#ifndef DISABLE_TEXT_CONSOLE
nocashMessage((char *) ptr);
// consolePrintf((char *) ptr); // consolePrintf((char *) ptr);
#endif
return size; return size;
} }

2
backends/platform/ds/arm9/makefile
View file

@ -236,7 +236,7 @@ CXXFLAGS= $(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder \
ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork 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 ifdef USE_MAD
DEFINES += -DUSE_MAD DEFINES += -DUSE_MAD
endif endif

4
backends/platform/ds/arm9/source/dsmain.cpp
View file

@ -3227,6 +3227,10 @@ int main(void) {
int main() { int main() {
#ifndef DISABLE_TEXT_CONSOLE
consoleDebugInit(DebugDevice_NOCASH);
nocashMessage("startup\n");
#endif
DS::main(); DS::main();
} }

4
backends/platform/ds/arm9/source/portdefs.h
View file

@ -40,10 +40,6 @@
#define double float #define double float
#ifndef DISABLE_TEXT_CONSOLE
#define DISABLE_TEXT_CONSOLE
#endif
#ifndef DISABLE_COMMAND_LINE #ifndef DISABLE_COMMAND_LINE
#define DISABLE_COMMAND_LINE #define DISABLE_COMMAND_LINE
#endif #endif

3
configure vendored
View file

@ -1600,13 +1600,14 @@ if test -n "$_host"; then
DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER" DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK" DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU" 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 _need_memalign=yes
add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1' 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_SMUSH_ASM = 1'
add_line_to_config_mk 'USE_ARM_GFX_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_COSTUME_ASM = 1'
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1' add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
_backend="ds" _backend="ds"
_build_scalers=no _build_scalers=no
_mt32emu=no _mt32emu=no