TESTBED: Merged changes from trunk to my branch

svn-id: r51798

1 files changed, 342 insertions, 236 deletions

diff --git a/configure b/configure
index b3a95adf55..d74efa5eaa 100755
--- a/configure
+++ b/configure
@@ -120,6 +120,7 @@ _tremor=auto
 _flac=auto
 _mad=auto
 _alsa=auto
+_seq_midi=auto
 _zlib=auto
 _mpeg2=no
 _fluidsynth=auto
@@ -134,9 +135,12 @@ _build_scalers=yes
 _build_hq_scalers=yes
 _indeo3=auto
 _enable_prof=no
+_unix=no
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
+# GUI translation options
+_translation=yes
 # Default platform settings
 _backend=sdl
 _endian=unknown
@@ -266,6 +270,10 @@ add_line_to_config_h() {
 '"$1"
 }
 
+# Conditionally add a line of data to config.h. Takes two parameters:
+# The first one can be set to 'no' to "comment out" the line, i.e.
+# make it ineffective, use 'yes' otherwise.
+# The second param is the line to insert.
 add_to_config_h_if_yes() {
 	if test "$1" = yes ; then
 		add_line_to_config_h "$2"
@@ -286,15 +294,28 @@ add_to_config_mk_if_yes() {
 	fi
 }
 
-# Conditionally add a line of data to config.mk. Takes two parameters:
-# The first one can be set to 'yes' to "comment out" the line, i.e.
-# make it ineffective, use 'no' otherwise.
-# The second param is the line to insert.
-add_to_config_mk_if_no() {
-	if test "$1" = no ; then
-		add_line_to_config_mk "$2"
+# Conditionally add a '#define' line to config.h. Takes two parameters:
+# The first one can be set to 'yes' or 'no'. If 'yes' is used, then
+# the line "#define $2" is added to config.h, otherwise "#undef $2".
+define_in_config_h_if_yes() {
+	if test "$1" = yes ; then
+		add_line_to_config_h "#define $2"
 	else
-		add_line_to_config_mk "# $2"
+		add_line_to_config_h "#undef $2"
+	fi
+}
+
+# Conditionally add definitions to config.h and config.mk. Takes two parameters:
+# The first one can be set to 'yes' or 'no'. If 'yes' is used, then
+# the line "#define $2" is added to config.h and "$2 = 1" to config.mk.
+# Otherwise "#undef $2" is added to config.h and "# $2 = 1" to config.mk
+define_in_config_if_yes() {
+	if test "$1" = yes ; then
+		add_line_to_config_h "#define $2"
+		add_line_to_config_mk "$2 = 1"
+	else
+		add_line_to_config_h "#undef $2"
+		add_line_to_config_mk "# $2 = 1"
 	fi
 }
 
@@ -342,7 +363,7 @@ get_system_exe_extension() {
 	arm-riscos)
 		_exeext=",ff8"
 		;;
-	dreamcast | gamecube | nds | ps2 | psp | wii)
+	dreamcast | ds | gamecube | n64 | ps2 | psp | wii)
 		_exeext=".elf"
 		;;
 	gp2x-linux)
@@ -626,7 +647,7 @@ Usage: $0 [OPTIONS]...
 Configuration:
   -h, --help              display this help and exit
   --backend=BACKEND       backend to build (dc, gp2x, gp2xwiz, iphone,
-                          linuxmoto, nds, null, ps2, psp, sdl, wii, wince)
+                          linuxmoto, ds, null, ps2, psp, sdl, wii, wince)
                           [sdl]
 
 Installation directories:
@@ -656,7 +677,7 @@ Special configuration feature:
                                            gamecube for Nintendo GameCube
                                            iphone for Apple iPhone
                                            linupy for Yopy PDA
-                                           nds for Nintendo DS
+                                           ds for Nintendo DS
                                            ps2 for PlayStation 2
                                            psp for PlayStation Portable
                                            wii for Nintendo Wii
@@ -677,6 +698,7 @@ Optional Features:
   --disable-16bit          don't enable 16bit color support
   --disable-scalers        exclude scalers
   --disable-hq-scalers     exclude HQ2x and HQ3x scalers
+  --disable-translation    don't build support for translated messages
   --enable-text-console    use text console instead of graphical console
   --enable-verbose-build   enable regular echoing of commands during build process
 
@@ -738,6 +760,8 @@ for ac_option in $@; do
 	--disable-hq-scalers)     _build_hq_scalers=no ;;
 	--enable-alsa)            _alsa=yes       ;;
 	--disable-alsa)           _alsa=no        ;;
+	--enable-seq-midi)        _seq_midi=yes        ;;
+	--disable-seq-midi)       _seq_midi=no         ;;
 	--enable-vorbis)          _vorbis=yes     ;;
 	--disable-vorbis)         _vorbis=no      ;;
 	--enable-tremor)          _tremor=yes     ;;
@@ -761,6 +785,8 @@ for ac_option in $@; do
 	--default-dynamic)        _plugins_default=dynamic ;;
 	--enable-mt32emu)         _mt32emu=yes    ;;
 	--disable-mt32emu)        _mt32emu=no     ;;
+	--enable-translation)     _translation=yes ;;
+	--disable-translation)    _translation=no ;;
 	--enable-vkeybd)          _vkeybd=yes     ;;
 	--disable-vkeybd)         _vkeybd=no      ;;
 	--enable-keymapper)       _keymapper=yes  ;;
@@ -896,6 +922,11 @@ get_system_exe_extension $guessed_host
 NATIVEEXEEXT=$_exeext
 
 case $_host in
+android)
+	_host_os=android
+	_host_cpu=arm
+	_host_alias=arm-oe-linux-androideabi
+	;;
 arm-riscos)
 	_host_os=riscos
 	_host_cpu=arm
@@ -907,6 +938,11 @@ dreamcast)
 	CXXFLAGS="$CXXFLAGS -ml -m4-single-only"
 	LDFLAGS="$LDFLAGS -ml -m4-single-only"
 	;;
+ds)
+	_host_os=ds
+	_host_cpu=arm
+	_host_alias=arm-eabi
+	;;
 gamecube)
 	_host_os=gamecube
 	_host_cpu=ppc
@@ -945,10 +981,10 @@ motomagx)
 	_host_cpu=arm
 	_host_alias=arm-linux-gnueabi
 	;;
-nds)
-	_host_os=nds
-	_host_cpu=arm
-	_host_alias=arm-eabi
+n64)	
+	_host_os=n64
+	_host_cpu=mips
+	_host_alias=mips64
 	;;
 neuros)
 	_host_os=linux
@@ -1000,11 +1036,6 @@ wince)
 	_host_cpu=arm
 	_host_alias=arm-wince-mingw32ce
 	;;
-android)
-	_host_os=android
-	_host_cpu=arm
-	_host_alias=arm-android-eabi
-	;;
 *)
 	if test -n "$_host"; then
 		guessed_host=`$_srcdir/config.sub $_host`
@@ -1038,7 +1069,9 @@ fi
 if test "$_release_build" = yes; then
 	# Release mode enabled: enable optimizations. This also
 	# makes it possible to use -Wuninitialized, so let's do that.
-	CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized"
+	# We will also add a define, which indicates we are doing
+	# an build for a release version.
+	CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized -DRELEASE_BUILD"
 fi
 
 
@@ -1064,12 +1097,24 @@ esac
 # Platform specific sanity checks
 #
 case $_host_os in
-gamecube | nds | wii)
+android)
+	if test -z "$ANDROID_SDK"; then
+		echo "Please set ANDROID_SDK in your environment. export ANDROID_SDK=<path to Android SDK>"
+		exit 1
+	fi
+	;;
+ds | gamecube | wii)
 	if test -z "$DEVKITPRO"; then
 		echo "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to devkitPRO>"
 		exit 1
 	fi
 	;;
+n64)
+	if test -z "$N64SDK"; then
+		echo "Please set N64SDK in your environment. export N64SDK=<path to n64 sdk>"
+		exit 1
+	fi
+	;;
 ps2)
 	if test -z "$PS2SDK"; then
 		echo "Please set PS2SDK in your environment. export PS2SDK=<path to ps2 sdk>"
@@ -1083,12 +1128,6 @@ psp)
 		exit 1
 	fi
 	;;
-android)
-	if test -z "$ANDROID_SDK"; then
-		echo "Please set ANDROID_SDK in your environment. export ANDROID_SDK=<path to Android SDK>"
-		exit 1
-	fi
-	;;
 *)
 	;;
 esac
@@ -1132,9 +1171,12 @@ else
 	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
@@ -1314,55 +1356,78 @@ echo $_host_os
 case $_host_os in
 	amigaos*)
 		CXXFLAGS="$CXXFLAGS -mcrt=newlib -mstrict-align -mcpu=750 -mtune=7400"
-		LDFLAGS="$LDFLAGS -mcrt=newlib -use-dynld -Lsobjs:"
+		LDFLAGS="$LDFLAGS -mcrt=newlib -use-dynld -LSDK:Local/newib/lib"
 		# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
 		# as (unsigned) long, and consequently we'd get a compiler error otherwise.
 		type_4_byte='long'
 		;;
+	android)
+		CXXFLAGS="$CXXFLAGS -Os -msoft-float -mtune=xscale -march=armv5te -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__"
+		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
+		_unix=yes
+		_seq_midi=no
+		;;
 	beos*)
-		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lbind -lsocket for the timidity MIDI driver
 		LDFLAGS="-L/boot/home/config/lib"
 		CFLAGS="-I/boot/home/config/include"
 		CXXFLAGS="$CXXFLAGS -fhuge-objects"
 		LIBS="$LIBS -lbind -lsocket"
+		_unix=yes
+		_seq_midi=no
 		;;
 	bsd* | hpux* | netbsd* | openbsd* | sunos*)
-		DEFINES="$DEFINES -DUNIX"
+		_unix=yes
 		;;
 	cygwin*)
 		echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
 		exit 1
 		;;
 	darwin*)
-		DEFINES="$DEFINES -DUNIX -DMACOSX"
+		DEFINES="$DEFINES -DMACOSX"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'
+		_unix=yes
 		;;
 	dreamcast)
 		DEFINES="$DEFINES -D__DC__ -DNONSTANDARD_PORT"
 		;;
+	ds)
+		# TODO Nintendo DS
+		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
+		CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
+		CXXFLAGS="$CXXFLAGS -mcpu=arm9tdmi -mtune=arm9tdmi -fomit-frame-pointer -mthumb-interwork"
+		CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fno-strict-aliasing"
+		LDFLAGS="$LDFLAGS -specs=ds_arm9.specs -mthumb-interwork -mno-fpu -Wl,-Map,map.txt -Wl,--gc-sections"
+		LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
+		LIBS="$LIBS -lnds9"
+		;;
 	freebsd*)
-		DEFINES="$DEFINES -DUNIX"
 		LDFLAGS="$LDFLAGS -L/usr/local/lib"
 		CXXFLAGS="$CXXFLAGS -I/usr/local/include"
+		_unix=yes
 		;;
 	gamecube)
 		CXXFLAGS="$CXXFLAGS -Os -mogc -mcpu=750 -meabi -mhard-float"
 		CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fmodulo-sched"
 		CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include -I$DEVKITPRO/cube/include"
-		LDFLAGS="$LDFLAGS -mogc -mcpu=750 -L$DEVKITPRO/libogc/lib/cube -L$DEVKITPRO/cube/lib"
+		# libogc is required to link the cc tests (includes _start())
+		LDFLAGS="$LDFLAGS -mogc -mcpu=750 -L$DEVKITPRO/libogc/lib/cube -L$DEVKITPRO/cube/lib -logc"
 		;;
 	haiku*)
-		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lnetwork for the timidity MIDI driver
 		LIBS="$LIBS -lnetwork"
 		CXXFLAGS="$CXXFLAGS -fhuge-objects"
+		_unix=yes
+		_seq_midi=no
 		;;
 	irix*)
-		DEFINES="$DEFINES -DUNIX -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DIRIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		LIBS="$LIBS -lmd -lfastm -lm"
 		_ranlib=:
+		_unix=yes
 		;;
 	linux* | uclinux*)
 		# When not cross-compiling, enable large file support, but don't
@@ -1370,7 +1435,7 @@ case $_host_os in
 		if test -z "$_host"; then
 			CXXFLAGS="$CXXFLAGS $(getconf LFS_CFLAGS 2>/dev/null)"
 		fi
-		DEFINES="$DEFINES -DUNIX"
+		_unix=yes
 		;;
 	mingw*)
 		DEFINES="$DEFINES -DWIN32 -D__USE_MINGW_ANSI_STDIO=0"
@@ -1378,14 +1443,16 @@ case $_host_os in
 		OBJS="$OBJS scummvmico.o"
 		;;
 	mint*)
-		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		_unix=yes
 		;;
-	nds)
-		# TODO nds
-		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
+	n64)
+		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT" 
+		DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_COMMAND_LINE"
+		DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DDISABLE_DOSBOX_OPL -DDISABLE_SID -DDISABLE_NES_APU"
 		;;
 	os2-emx*)
-		DEFINES="$DEFINES -DUNIX"
+		_unix=yes	# FIXME??? Why??
 		;;
 	ps2)
 		# TODO ps2
@@ -1396,30 +1463,27 @@ case $_host_os in
 		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
 		;;
 	solaris*)
-		DEFINES="$DEFINES -DUNIX -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lbind -lsocket for the timidity MIDI driver
 		LIBS="$LIBS -lnsl -lsocket"
+		_unix=yes
 		;;
 	wii)
 		CXXFLAGS="$CXXFLAGS -Os -mrvl -mcpu=750 -meabi -mhard-float"
 		CXXFLAGS="$CXXFLAGS -ffunction-sections -fdata-sections -fmodulo-sched"
 		CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include -I$DEVKITPRO/wii/include"
-		LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -L$DEVKITPRO/libogc/lib/wii -L$DEVKITPRO/wii/lib"
+		# libogc is required to link the cc tests (includes _start())
+		LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -L$DEVKITPRO/libogc/lib/wii -L$DEVKITPRO/wii/lib -logc"
 		;;
 	wince)
 		CXXFLAGS="$CXXFLAGS -O3 -march=armv4 -mtune=xscale"
 		DEFINES="$DEFINES -D_WIN32_WCE=300 -D__ARM__ -D_ARM_ -DUNICODE -DFPM_DEFAULT -DNONSTANDARD_PORT"
 		DEFINES="$DEFINES -DWIN32 -Dcdecl= -D__cdecl__="
 		;;
-	android)
-		DEFINES="$DEFINES -DUNIX"
-		CXXFLAGS="$CXXFLAGS -Os -msoft-float -mtune=xscale -march=armv5te -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5TE__"
-		add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
-		;;
 	# given this is a shell script assume some type of unix
 	*)
 		echo "WARNING: could not establish system type, assuming unix like"
-		DEFINES="$DEFINES -DUNIX"
+		_unix=yes
 		;;
 esac
 
@@ -1427,8 +1491,21 @@ if test -n "$_host"; then
 	# Cross-compiling mode - add your target here if needed
 	echo "Cross-compiling to $_host"
 	case "$_host" in
+		android)
+			DEFINES="$DEFINES -DANDROID -DUSE_ARM_SMUSH_ASM"
+			_unix=yes
+			_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_SCALER_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
+			_backend="android"
+			_port_mk="backends/platform/android/android.mk"
+			_seq_midi=no
+			;;
 		arm-linux|arm*-linux-gnueabi|arm-*-linux)
-			DEFINES="$DEFINES -DUNIX"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
@@ -1437,7 +1514,8 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			;;
 		arm-riscos|linupy)
-			DEFINES="$DEFINES -DUNIX -DLINUPY"
+			DEFINES="$DEFINES -DLINUPY"
+			_unix=yes
 			_need_memalign=yes
 			;;
 		bfin*)
@@ -1452,18 +1530,36 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
 			_need_memalign=yes
 			_backend="dc"
-			_build_scalers="no"
-			_mad="yes"
-			_zlib="yes"
+			_build_scalers=no
+			_mad=yes
+			_zlib=yes
 			add_line_to_config_mk 'ronindir = /usr/local/ronin'
 			_port_mk="backends/platform/dc/dreamcast.mk"
 			;;
+		ds)
+			# TODO: complete this
+			DEFINES="$DEFINES -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555"
+			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"
+			_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'
+			_backend="ds"
+			_build_scalers=no
+			_mt32emu=no
+			_port_mk="backends/platform/ds/ds.mk"
+			;;
 		gamecube)
 			_endian=big
 			_need_memalign=yes
 			_backend="wii"
-			_build_scalers="no"
-			_mt32emu="no"
+			_build_scalers=no
+			_mt32emu=no
 			_port_mk="backends/platform/wii/wii.mk"
 			add_line_to_config_mk 'GAMECUBE = 1'
 			add_line_to_config_h '#define GAMECUBE'
@@ -1472,10 +1568,11 @@ if test -n "$_host"; then
 			add_line_to_config_h "/* #define DEBUG_WII_GDB */"
 			;;
 		gp2x)
-			DEFINES="$DEFINES -DUNIX -DGP2X -DNDEBUG"
+			DEFINES="$DEFINES -DGP2X -DNDEBUG"
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
@@ -1483,14 +1580,17 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="gp2x"
-			_build_hq_scalers="no"
-			_mt32emu="no"
-			_vkeybd="yes"
+			_build_hq_scalers=no
+			_mt32emu=no
+			_vkeybd=yes
+			_seq_midi=no
+			_port_mk="backends/platform/gp2x/gp2x-bundle.mk"
 			;;
 		gp2xwiz)
-			DEFINES="$DEFINES -DUNIX -DGP2XWIZ -DNDEBUG"
+			DEFINES="$DEFINES -DGP2XWIZ -DNDEBUG"
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
@@ -1498,24 +1598,30 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="gp2xwiz"
-			_build_hq_scalers="no"
-			_mt32emu="no"
-			_vkeybd="yes"
+			_build_hq_scalers=no
+			_mt32emu=no
+			_vkeybd=yes
+			_seq_midi=no
+			_port_mk="backends/platform/gp2xwiz/gp2xwiz-bundle.mk"
 			;;
 		iphone)
-			DEFINES="$DEFINES -DIPHONE -DUNIX"
+			DEFINES="$DEFINES -DIPHONE"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			_backend="iphone"
-			_build_hq_scalers="no"
+			_build_hq_scalers=no
+			_seq_midi=no
 			;;
 		m68k-atari-mint)
-			DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+			DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+			_unix=yes
 			_endian=big
 			_need_memalign=yes
 			_ranlib=m68k-atari-mint-ranlib
 			_ar="m68k-atari-mint-ar cru"
+			_seq_midi=no
 			;;
 		*mingw32*)
 			_sdlconfig=$_host-sdl-config
@@ -1528,8 +1634,9 @@ if test -n "$_host"; then
 			_need_memalign=yes
 			;;
 		motoezx)
-			DEFINES="$DEFINES -DUNIX -DMOTOEZX"
+			DEFINES="$DEFINES -DMOTOEZX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
@@ -1537,14 +1644,16 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="linuxmoto"
-			_build_hq_scalers="no"
-			_mt32emu="no"
-			_vkeybd="yes"
+			_build_hq_scalers=no
+			_mt32emu=no
+			_vkeybd=yes
+			_seq_midi=no
 			_port_mk="backends/platform/linuxmoto/linuxmoto.mk"
 			;;
 		motomagx)
-			DEFINES="$DEFINES -DUNIX -DMOTOMAGX"
+			DEFINES="$DEFINES -DMOTOMAGX"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
@@ -1552,36 +1661,42 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="linuxmoto"
-			_build_hq_scalers="no"
-			_mt32emu="no"
-			_vkeybd="yes"
+			_build_hq_scalers=no
+			_mt32emu=no
+			_vkeybd=yes
+			_seq_midi=no
 			_port_mk="backends/platform/linuxmoto/linuxmoto.mk"
 			;;
-		nds)
-			# TODO: complete this
-			# 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 -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
+		n64)
+			CXXFLAGS="$CXXFLAGS -mno-extern-sdata --param max-inline-insns-auto=20 -fomit-frame-pointer"
+			CXXFLAGS="$CXXFLAGS -march=vr4300 -mtune=vr4300 -mhard-float"
+			LDFLAGS="$LDFLAGS -march=vr4300 -mtune=vr4300 -nodefaultlibs -nostartfiles -mno-crt0"
+			LDFLAGS="$LDFLAGS -L$N64SDK/hkz-libn64 -L$N64SDK/lib"
+			LDFLAGS="$LDFLAGS -T n64ld_cpp.x -Xlinker -Map -Xlinker scummvm.map"
+			_backend="n64"
 			_need_memalign=yes
-			_backend="nds"
-			_build_hq_scalers="no"
-			_mt32emu="no"
-			_port_mk="backends/platform/ds/ds.mk"
-			# TODO: Enable more ARM optimizations -- requires testing!
-			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'
+			_mt32emu=no
+			_vkeybd=yes
+			_build_scalers=no
+			_indeo3=no
+			_translation=no
+			_keymapper=no
+			_text_console=no
+			_vkeybd=yes
+			_dynamic_modules=no
+			_plugins_default=static
+			# Force use of libmad, libtremor and zlib
+			_mad=yes
+			_tremor=yes
+			_zlib=yes
 			;;
 		neuros)
-			DEFINES="$DEFINES -DUNIX -DNEUROS"
+			DEFINES="$DEFINES -DNEUROS"
+			_unix=yes
 			_need_memalign=yes
 			_backend='null'
-			_build_hq_scalers="no"
-			_mt32emu="no"
+			_build_hq_scalers=no
+			_mt32emu=no
 			;;
 		ppc-amigaos)
 			_endian=big
@@ -1590,16 +1705,17 @@ if test -n "$_host"; then
 		ps2)
 			# TODO: complete this
 			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
+			DEFINES="$DEFINES -DDISABLE_SID -DDISABLE_NES_APU"
 			_need_memalign=yes
 			_backend="ps2"
-			_build_scalers="no"
-			_mt32emu="no"
+			_build_scalers=no
+			_mt32emu=no
 			# HACK to enable mad & zlib (they are not properly detected due to linker issues).
 			# This trick doesn't work for tremor right now, as the PS2 port the resulting library
 			# libtremor, while our code later on expects it to be called libvorbisidec.
 			# TODO: Enable tremor, e.g. by adding  -ltremor or by renaming the lib.
-			_mad="yes"
-			_zlib="yes"
+			_mad=yes
+			_zlib=yes
 			# HACK to fix compilation of C source files for now.
 			add_line_to_config_mk 'CC = ee-gcc'
 			# HACK to fix linking for now. It seems ee-g++ does not handle linking correctly.
@@ -1619,14 +1735,15 @@ if test -n "$_host"; then
 		psp)
 			_need_memalign=yes
 			_backend="psp"
-			_build_scalers="no"
-			_mt32emu="no"
+			_build_scalers=no
+			_mt32emu=no
 			_port_mk="backends/platform/psp/psp.mk"
 			;;
 		samsungtv)
-			DEFINES="$DEFINES -DUNIX -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
+			DEFINES="$DEFINES -DSAMSUNGTV -DDISABLE_COMMAND_LINE"
 			ASFLAGS="$ASFLAGS -mfpu=vfp"
 			HOSTEXEEXT=".so"
+			_unix=yes
 			_need_memalign=yes
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
@@ -1634,14 +1751,14 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="samsungtv"
-			_mt32emu="no"
-			_vkeybd="yes"
+			_mt32emu=no
+			_vkeybd=yes
 			;;
 		wii)
 			_endian=big
 			_need_memalign=yes
 			_backend="wii"
-			_build_scalers="no"
+			_build_scalers=no
 			_port_mk="backends/platform/wii/wii.mk"
 			add_line_to_config_mk 'GAMECUBE = 0'
 			add_line_to_config_h "#define DEBUG_WII_USBGECKO"
@@ -1661,22 +1778,9 @@ if test -n "$_host"; then
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="wince"
-			_mt32emu="no"
+			_mt32emu=no
 			_port_mk="backends/platform/wince/wince.mk"
 			;;
-		android)
-			DEFINES="$DEFINES -DANDROID -DUNIX -DUSE_ARM_SMUSH_ASM"
-			_endian=little
-			_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_SCALER_ASM = 1'
-			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
-			_backend="android"
-			_port_mk="backends/platform/android/android.mk"
-			_build_hq_scalers="no"
-			;;
 		*)
 			echo "WARNING: Unknown target, continuing with auto-detected values"
 			;;
@@ -1753,21 +1857,25 @@ esac
 #
 case $_endian in
 	big)
-		add_line_to_config_h '/* #define SCUMM_LITTLE_ENDIAN */'
+		add_line_to_config_h '#undef SCUMM_LITTLE_ENDIAN'
 		add_line_to_config_h '#define SCUMM_BIG_ENDIAN'
 		;;
 	little)
 		add_line_to_config_h '#define SCUMM_LITTLE_ENDIAN'
-		add_line_to_config_h '/* #define SCUMM_BIG_ENDIAN */'
+		add_line_to_config_h '#undef SCUMM_BIG_ENDIAN'
 		;;
 	*)
 		exit 1
 		;;
 esac
 
-add_to_config_h_if_yes $_have_x86 '#define HAVE_X86'
+define_in_config_h_if_yes $_have_x86 'HAVE_X86'
 
-add_to_config_h_if_yes $_need_memalign '#define SCUMM_NEED_ALIGNMENT'
+define_in_config_h_if_yes $_need_memalign 'SCUMM_NEED_ALIGNMENT'
+
+if test "$_unix" = yes ; then
+	DEFINES="$DEFINES -DUNIX"
+fi
 
 #
 # Check whether to enable a verbose build
@@ -1901,7 +2009,7 @@ PLUGIN_SUFFIX		:= .plg
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
 CXXFLAGS		+= -DDYNAMIC_MODULES
 LDFLAGS			+= -Wl,-T$(srcdir)/backends/platform/psp/main_prog.ld
-PLUGIN_LDFLAGS		= -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/psp/plugin.syms,-T$(srcdir)/backends/platform/psp/plugin.ld -lstdc++ -lc -lm
+PLUGIN_LDFLAGS		= -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/psp/plugin.syms,-T$(srcdir)/backends/platform/psp/plugin.ld -lstdc++ -lc -lm -Wl,--wrap,memcpy
 PRE_OBJS_FLAGS		:= -Wl,--whole-archive
 POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
 '
@@ -1919,40 +2027,22 @@ fi
 #
 # Check whether integrated MT-32 emulator support is requested
 #
-if test "$_mt32emu" = no ; then
-	_def_mt32emu='#undef USE_MT32EMU'
-else
-	_def_mt32emu='#define USE_MT32EMU'
-fi
-add_to_config_mk_if_yes "$_mt32emu" 'USE_MT32EMU = 1'
+define_in_config_if_yes "$_mt32emu" 'USE_MT32EMU'
 
 #
 # Check whether 16bit color support is requested
 #
-if test "$_16bit" = no ; then
-	_def_16bit='#undef USE_RGB_COLOR'
-else
-	_def_16bit='#define USE_RGB_COLOR'
-fi
-add_to_config_mk_if_yes "$_16bit" 'USE_RGB_COLOR = 1'
+define_in_config_if_yes "$_16bit" 'USE_RGB_COLOR'
 
 #
 # Check whether to enable the (hq) scalers
 #
 if test "$_build_scalers" = no ; then
 	_build_hq_scalers=no
-	_def_scalers='#undef USE_SCALERS'
-else
-	_def_scalers='#define USE_SCALERS'
 fi
-add_to_config_mk_if_yes "$_build_scalers" 'USE_SCALERS = 1'
+define_in_config_if_yes "$_build_scalers" 'USE_SCALERS'
 
-if test "$_build_hq_scalers" = no ; then
-	_def_hq_scalers='#undef USE_HQ_SCALERS'
-else
-	_def_hq_scalers='#define USE_HQ_SCALERS'
-fi
-add_to_config_mk_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS = 1'
+define_in_config_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS'
 
 #
 # Check whether to compile the Indeo3 decoder
@@ -1960,17 +2050,12 @@ add_to_config_mk_if_yes "$_build_hq_scalers" 'USE_HQ_SCALERS = 1'
 if test "$_indeo3" = auto ; then
 	# Autodetect. Build if either the gob engine or plugins are enabled
 	if test `get_engine_build gob` = yes || test "$_dynamic_modules" = yes ; then
-		_indeo3="yes"
+		_indeo3=yes
 	else
-		_indeo3="no"
+		_indeo3=no
 	fi
 fi
-if test "$_indeo3" = no ; then
-	_def_indeo3='#undef USE_INDEO3'
-else
-	_def_indeo3='#define USE_INDEO3'
-fi
-add_to_config_mk_if_yes "$_indeo3" 'USE_INDEO3 = 1'
+define_in_config_if_yes "$_indeo3" 'USE_INDEO3'
 
 #
 # Check for math lib
@@ -1978,7 +2063,7 @@ add_to_config_mk_if_yes "$_indeo3" 'USE_INDEO3 = 1'
 cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
-cc_check -lm && LDFLAGS="$LDFLAGS -lm"
+cc_check -lm && LIBS="$LIBS -lm"
 
 #
 # Check for Ogg Vorbis
@@ -1994,13 +2079,10 @@ EOF
 		-lvorbisfile -lvorbis -logg && _vorbis=yes
 fi
 if test "$_vorbis" = yes ; then
-	_def_vorbis='#define USE_VORBIS'
 	LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS -lvorbisfile -lvorbis -logg"
 	INCLUDES="$INCLUDES $OGG_CFLAGS $VORBIS_CFLAGS"
-else
-	_def_vorbis='#undef USE_VORBIS'
 fi
-add_to_config_mk_if_yes "$_vorbis" 'USE_VORBIS = 1'
+define_in_config_if_yes "$_vorbis" 'USE_VORBIS'
 echo "$_vorbis"
 
 #
@@ -2017,15 +2099,15 @@ EOF
 	_tremor=yes
 fi
 if test "$_tremor" = yes && test "$_vorbis" = no; then
-	_def_tremor='#define USE_TREMOR'
-	_def_vorbis='#define USE_VORBIS'
+	add_line_to_config_h '#define USE_TREMOR'
+	add_line_to_config_h '#define USE_VORBIS'
 	LIBS="$LIBS $TREMOR_LIBS -lvorbisidec"
 	INCLUDES="$INCLUDES $TREMOR_CFLAGS"
 else
 	if test "$_vorbis" = yes; then
 		_tremor="no (Ogg Vorbis/Tremor support is mutually exclusive)"
 	fi
-	_def_tremor='#undef USE_TREMOR'
+	add_line_to_config_h '#undef USE_TREMOR'
 fi
 add_to_config_mk_if_yes "$_tremor" 'USE_TREMOR = 1'
 echo "$_tremor"
@@ -2049,17 +2131,14 @@ EOF
 	fi
 fi
 if test "$_flac" = yes ; then
-	_def_flac='#define USE_FLAC'
 	if test "$_vorbis" = yes ; then
 		LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
 	else
 		LIBS="$LIBS $FLAC_LIBS -lFLAC"
 	fi
 	INCLUDES="$INCLUDES $FLAC_CFLAGS"
-else
-	_def_flac='#undef USE_FLAC'
 fi
-add_to_config_mk_if_yes "$_flac" 'USE_FLAC = 1'
+define_in_config_if_yes "$_flac" 'USE_FLAC'
 echo "$_flac"
 
 #
@@ -2075,13 +2154,10 @@ EOF
 	cc_check $MAD_CFLAGS $MAD_LIBS -lmad && _mad=yes
 fi
 if test "$_mad" = yes ; then
-	_def_mad='#define USE_MAD'
 	LIBS="$LIBS $MAD_LIBS -lmad"
 	INCLUDES="$INCLUDES $MAD_CFLAGS"
-else
-	_def_mad='#undef USE_MAD'
 fi
-add_to_config_mk_if_yes "$_mad" 'USE_MAD = 1'
+define_in_config_if_yes "$_mad" 'USE_MAD'
 echo "$_mad"
 
 #
@@ -2097,15 +2173,26 @@ EOF
 	cc_check $ALSA_CFLAGS $ALSA_LIBS -lasound && _alsa=yes
 fi
 if test "$_alsa" = yes ; then
-	_def_alsa='#define USE_ALSA'
 	LIBS="$LIBS $ALSA_LIBS -lasound"
 	INCLUDES="$INCLUDES $ALSA_CFLAGS"
-else
-	_def_alsa='#undef USE_ALSA'
 fi
+define_in_config_h_if_yes "$_alsa" 'USE_ALSA'
 echo "$_alsa"
 
 #
+# Check for SEQ MIDI
+#
+echocheck "SEQ MIDI"
+if test "$_seq_midi" = auto ; then
+	# TODO: Test for /dev/sequencer presence? Or maybe just for /dev ?
+	# For now, we just always enable it when "unix" mode is on (backends
+	# that do not want it can disable it by setting _seq_midi=no).
+	_seq_midi="$_unix"
+fi
+define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI'
+echo "$_seq_midi"
+
+#
 # Check for ZLib
 #
 echocheck "zlib"
@@ -2119,13 +2206,10 @@ EOF
 	cc_check $ZLIB_CFLAGS $ZLIB_LIBS -lz && _zlib=yes
 fi
 if test "$_zlib" = yes ; then
-	_def_zlib='#define USE_ZLIB'
 	LIBS="$LIBS $ZLIB_LIBS -lz"
 	INCLUDES="$INCLUDES $ZLIB_CFLAGS"
-else
-	_def_zlib='#undef USE_ZLIB'
 fi
-add_to_config_mk_if_yes "$_zlib" 'USE_ZLIB = 1'
+define_in_config_if_yes "$_zlib" 'USE_ZLIB'
 echo "$_zlib"
 
 #
@@ -2165,13 +2249,10 @@ EOF
 	fi
 fi
 if test "$_mpeg2" = yes ; then
-	_def_mpeg2='#define USE_MPEG2'
 	INCLUDES="$INCLUDES $MPEG2_CFLAGS"
 	LIBS="$LIBS $MPEG2_LIBS -lmpeg2"
-else
-	_def_mpeg2='#undef USE_MPEG2'
 fi
-add_to_config_mk_if_yes "$_mpeg2" 'USE_MPEG2 = 1'
+define_in_config_if_yes "$_mpeg2" 'USE_MPEG2'
 echo "$_mpeg2"
 
 #
@@ -2187,7 +2268,6 @@ EOF
 	cc_check $FLUIDSYNTH_CFLAGS $FLUIDSYNTH_LIBS -lfluidsynth && _fluidsynth=yes
 fi
 if test "$_fluidsynth" = yes ; then
-	_def_fluidsynth='#define USE_FLUIDSYNTH'
 	case $_host_os in
 		mingw*)
 			LIBS="$LIBS $FLUIDSYNTH_LIBS -lfluidsynth -ldsound -lwinmm"
@@ -2197,9 +2277,8 @@ if test "$_fluidsynth" = yes ; then
 		;;
 	esac
 	INCLUDES="$INCLUDES $FLUIDSYNTH_CFLAGS"
-else
-	_def_fluidsynth='#undef USE_FLUIDSYNTH'
 fi
+define_in_config_h_if_yes "$_fluidsynth" 'USE_FLUIDSYNTH'
 echo "$_fluidsynth"
 
 #
@@ -2219,12 +2298,13 @@ int main(void) {
 	char *x = readline("");
 }
 EOF
-		cc_check $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS && _readline=yes
+		cc_check_no_clean $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS && _readline=yes
 		if test "$_readline" = no ; then
 			_READLINE_LIBS="-lreadline -ltermcap"
-			cc_check $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS && _readline=yes
+			cc_check_no_clean $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS && _readline=yes
 		fi
 	fi
+	cc_check_clean
 	echo "$_readline"
 else
 	_readline=no
@@ -2232,18 +2312,12 @@ else
 fi
 
 if test "$_readline" = yes ; then
-	_def_readline='#define USE_READLINE'
 	LIBS="$LIBS $READLINE_LIBS $_READLINE_LIBS"
 	INCLUDES="$INCLUDES $READLINE_CFLAGS"
-else
-	_def_readline='#undef USE_READLINE'
 fi
+define_in_config_h_if_yes "$_readline" 'USE_READLINE'
 
-if test "$_text_console" = yes ; then
-	_def_text_console='#define USE_TEXT_CONSOLE'
-else
-	_def_text_console='#undef USE_TEXT_CONSOLE'
-fi
+define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE'
 
 #
 # Check for nasm
@@ -2301,8 +2375,7 @@ if test "$_have_x86" = yes ; then
 	fi
 fi
 
-add_to_config_h_if_yes $_nasm '#define USE_NASM'
-add_to_config_mk_if_yes $_nasm 'USE_NASM = 1'
+define_in_config_if_yes $_nasm 'USE_NASM'
 
 #
 # Enable vkeybd / keymapper
@@ -2314,6 +2387,30 @@ if test "$_keymapper" = yes ; then
 	DEFINES="$DEFINES -DENABLE_KEYMAPPER"
 fi
 
+# Check whether to build translation support
+#
+echo_n "Building translation support... "
+define_in_config_if_yes $_translation 'USE_TRANSLATION'
+if test "$_translation" = no ; then
+	echo "no"
+else
+	echo_n "yes ("
+
+	cat > $TMPC << EOF
+#include <locale.h>
+int main(void) { setlocale(LC_ALL, ""); return 0; }
+EOF
+	_detectlang=no
+	cc_check $LDFLAGS $CXXFLAGS && _detectlang=yes
+
+	define_in_config_h_if_yes $_detectlang 'USE_DETECTLANG'
+	if test "$_detectlang" = yes ; then
+		echo "with runtime language detection)"
+	else
+		echo "without runtime language detection)"
+	fi
+fi
+
 #
 # Figure out installation directories
 #
@@ -2379,11 +2476,49 @@ fi
 # Backend related stuff
 #
 case $_backend in
+	android)
+		static_libs=''
+		system_libs=''
+		for lib in $LIBS; do
+			case $lib in
+			-lz|-lm)
+				system_libs="$system_libs $lib"
+				;;
+			*)
+				static_libs="$static_libs $lib"
+				;;
+			esac
+		done
+
+		# -lgcc is carefully placed here - we want to catch
+		# all toolchain symbols in *our* libraries rather
+		# than pick up anything unhygenic from the Android libs.
+		LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -lstdc++ -llog -lGLESv1_CM"
+		DEFINES="$DEFINES -D__ANDROID__ -DANDROID_BACKEND -DREDUCE_MEMORY_USAGE"
+		add_line_to_config_mk 'PLUGIN_LDFLAGS += $(LDFLAGS) -Wl,-shared,-Bsymbolic'
+
+		# Work around an Android 2.0+ run-time linker bug:
+		# The linker doesn't actually look in previously
+		# loaded libraries when trying to resolve symbols -
+		# effectively turning all dlopen(RTLD_GLOBAL) calls
+		# into dlopen(RTLD_LOCAL).  It *does* look in
+		# DT_NEEDED libraries, so the workaround is to add an
+		# (otherwise unnecessary) dependency from plugins back
+		# to the main libscummvm.so.
+		add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm'
+		add_line_to_config_mk 'PLUGIN_EXTRA_DEPS += build.tmp/libscummvm.so'
+		;;
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
 		LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
 		LIBS="$LIBS -lronin -lm"
 		;;
+	ds)
+		# TODO ds
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
+		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
+		;;
 	gp2x)
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
@@ -2408,8 +2543,12 @@ case $_backend in
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
 		DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
 		;;
-	nds)
-		# TODO nds
+	n64)
+		INCLUDES="$INCLUDES "'-I$(N64SDK)/include'
+		INCLUDES="$INCLUDES "'-I$(N64SDK)/mips64/include'
+		INCLUDES="$INCLUDES "'-I$(N64SDK)/hkz-libn64'
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/n64'
+		LIBS="$LIBS -lpakfs -lframfs -ln64 -ln64utils -lromfs -lm -lstdc++ -lc -lgcc -lz -lnosys"
 		;;
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
@@ -2424,14 +2563,8 @@ case $_backend in
 		;;
 	psp)
 		DEFINES="$DEFINES -D__PSP__ -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DDISABLE_DOSBOX_OPL"
-		INCLUDES="$INCLUDES -I$PSPDEV/psp/include/SDL"
-		LIBS="$LIBS -lpng -lSDL -Wl,-Map,mapfile.txt"
-		SDLLIBS=`$PSPDEV/psp/bin/sdl-config --libs`
-
-		if `echo "$SDLLIBS" | grep ".*-lGL.*" 1>/dev/null 2>&1`
-		then
-			LIBS="$LIBS -lGL"
-		fi
+		LIBS="$LIBS -lpng -Wl,-Map,mapfile.txt"
+		LDFLAGS="$LDFLAGS -Wl,--wrap,memcpy"
 		;;
 	samsungtv)
 		find_sdlconfig
@@ -2462,14 +2595,6 @@ case $_backend in
 		INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
 		LIBS="$LIBS -static -lSDL"
 		;;
-	android)
-		# -lgcc is carefully placed here - we want to catch
-		# all toolchain symbols in *our* libraries rather
-		# than pick up anything unhygenic from the Android libs.
-		LIBS="$LIBS -lgcc -lstdc++ -llog -lGLESv1_CM -lEGL"
-		DEFINES="$DEFINES -D__ANDROID__ -DANDROID_BACKEND -DREDUCE_MEMORY_USAGE"
-		add_line_to_config_mk 'PLUGIN_LDFLAGS += $(LDFLAGS) -Wl,-shared,-Bsymbolic'
-		;;
 	*)
 		echo "support for $_backend backend not implemented in configure script yet"
 		exit 1
@@ -2485,7 +2610,7 @@ if test "$have_gcc" = yes ; then
 		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)
+		amigaos* | android | ds | dreamcast | gamecube | mingw* | n64 | psp | wii | wince )
 			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
 			;;
 		*)
@@ -2506,7 +2631,7 @@ fi;
 
 # Some platforms use certain GNU extensions in header files
 case $_host_os in
-gamecube | psp | wii | android)
+android | gamecube | psp | wii)
 	;;
 *)
 	CXXFLAGS="$CXXFLAGS -pedantic"
@@ -2614,25 +2739,6 @@ typedef signed $type_1_byte int8;
 typedef signed $type_2_byte int16;
 typedef signed $type_4_byte int32;
 
-/* Libs */
-$_def_vorbis
-$_def_tremor
-$_def_flac
-$_def_mad
-$_def_alsa
-$_def_zlib
-$_def_mpeg2
-$_def_fluidsynth
-$_def_readline
-
-/* Options */
-$_def_text_console
-$_def_mt32emu
-$_def_indeo3
-$_def_16bit
-$_def_scalers
-$_def_hq_scalers
-
 /* Plugin settings */
 $_def_plugin