[Scummvm-cvs-logs] SF.net SVN: scummvm:[52534] scummvm/branches/gsoc2010-plugins

[dhewg at users.sourceforge.net]

Revision: 52534
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52534&view=rev
Author:   dhewg
Date:     2010-09-04 22:26:12 +0000 (Sat, 04 Sep 2010)

Log Message:
-----------
DS: Merge r52533 from trunk.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/fs/ds/ds-fs.cpp
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/portdefs.h
    scummvm/branches/gsoc2010-plugins/configure

Property Changed:
----------------
    scummvm/branches/gsoc2010-plugins/
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/


Property changes on: scummvm/branches/gsoc2010-plugins
___________________________________________________________________
Modified: svn:mergeinfo
   - /scummvm/branches/gsoc2009-draci:41389-44325
/scummvm/trunk:49122-51947,52074,52089,52161,52357
   + /scummvm/branches/gsoc2009-draci:41389-44325
/scummvm/trunk:49122-51947,52074,52089,52161,52357,52533

Modified: scummvm/branches/gsoc2010-plugins/backends/fs/ds/ds-fs.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/fs/ds/ds-fs.cpp	2010-09-04 22:19:20 UTC (rev 52533)
+++ scummvm/branches/gsoc2010-plugins/backends/fs/ds/ds-fs.cpp	2010-09-04 22:26:12 UTC (rev 52534)
@@ -631,7 +631,10 @@
 		return 0;
 
 	if ((handle == stderr) || (handle == stdout)) {
+#ifndef DISABLE_TEXT_CONSOLE
+		nocashMessage((char *) ptr);
 //		consolePrintf((char *) ptr);
+#endif
 		return size;
 	}
 


Property changes on: scummvm/branches/gsoc2010-plugins/backends/platform/ds
___________________________________________________________________
Modified: svn:mergeinfo
   - /scummvm/branches/gsoc2009-draci/backends/platform/ds:41389-44325
/scummvm/trunk/backends/platform/ds:49122-51947
   + /scummvm/branches/gsoc2009-draci/backends/platform/ds:41389-44325
/scummvm/trunk/backends/platform/ds:49122-51947,52533

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-09-04 22:19:20 UTC (rev 52533)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-09-04 22:26:12 UTC (rev 52534)
@@ -237,7 +237,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 -DELF_LOADER_TARGET -DARM -DARM_TARGET -DONE_PLUGIN_AT_A_TIME
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DARM -DARM_TARGET -DONE_PLUGIN_AT_A_TIME
 ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp	2010-09-04 22:19:20 UTC (rev 52533)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/dsmain.cpp	2010-09-04 22:26:12 UTC (rev 52534)
@@ -3232,6 +3232,10 @@
 
 
 int main() {
+#ifndef DISABLE_TEXT_CONSOLE
+	consoleDebugInit(DebugDevice_NOCASH);
+	nocashMessage("startup\n");
+#endif
 	DS::main();
 }
 

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/portdefs.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/portdefs.h	2010-09-04 22:19:20 UTC (rev 52533)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/source/portdefs.h	2010-09-04 22:26:12 UTC (rev 52534)
@@ -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/branches/gsoc2010-plugins/configure
===================================================================
--- scummvm/branches/gsoc2010-plugins/configure	2010-09-04 22:19:20 UTC (rev 52533)
+++ scummvm/branches/gsoc2010-plugins/configure	2010-09-04 22:26:12 UTC (rev 52534)
@@ -1546,7 +1546,7 @@
 			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"
 			DEFINES="$DEFINES -DARM_TARGET"
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
@@ -1554,6 +1554,7 @@
 			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.