[Scummvm-cvs-logs] SF.net SVN: scummvm:[50582] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 50582
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50582&view=rev
Author:   fingolfin
Date:     2010-07-01 23:12:28 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
NDS: Some tweaks for compiling via std build system

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h
    scummvm/trunk/configure

Modified: scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h	2010-07-01 23:05:13 UTC (rev 50581)
+++ scummvm/trunk/backends/platform/ds/arm9/source/portdefs.h	2010-07-01 23:12:28 UTC (rev 50582)
@@ -52,10 +52,17 @@
 
 #define CT_NO_TRANSPARENCY
 
+#ifndef DISABLE_TEXT_CONSOLE
 #define DISABLE_TEXT_CONSOLE
+#endif
+
+#ifndef DISABLE_COMMAND_LINE
 #define DISABLE_COMMAND_LINE
+#endif
 
+#ifndef DISABLE_COMMAND_LINE
 #define STREAM_AUDIO_FROM_DISK
+#endif
 
 //#undef assert
 //#define assert(expr) consolePrintf("Asserted!")

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2010-07-01 23:05:13 UTC (rev 50581)
+++ scummvm/trunk/configure	2010-07-01 23:12:28 UTC (rev 50582)
@@ -1138,9 +1138,12 @@
 	CXX=
 	for compiler in $compilers; do
 		if test_compiler $compiler; then
+			echo "success testing compiler: $1" >> "$TMPLOG"
 			CXX=$compiler
 			echo $CXX
 			break
+		else
+			echo "failure testing compiler: $1" >> "$TMPLOG"
 		fi
 	done
 fi
@@ -1389,7 +1392,7 @@
 		;;
 	nds)
 		# TODO nds
-		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
+		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT -I$DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
 		;;
 	os2-emx*)
 		DEFINES="$DEFINES -DUNIX"
@@ -1572,7 +1575,7 @@
 			# TODO: Maybe rename nds -> ds (would be more consistent with other backends)
 			DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555"
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER"
-			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE -DSTREAM_AUDIO_FROM_DISK"
 			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
 			_need_memalign=yes
 			_backend="nds"
@@ -2444,6 +2447,7 @@
 		;;
 	nds)
 		# TODO nds
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source -I$(srcdir)/backends/platform/ds/commoninclude'
 		;;
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
@@ -2512,7 +2516,7 @@
 		case $_host_os in
 		# newlib-based system include files suppress non-C89 function
 		# declarations under __STRICT_ANSI__
-		mingw* | dreamcast | wii | gamecube | psp | wince | amigaos* | android)
+		mingw* | dreamcast | wii | gamecube | nds | psp | wince | amigaos* | android)
 			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
 			;;
 		*)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.