From 33c2e03ccc30fb5c7464319081bf5599858f6fd1 Mon Sep 17 00:00:00 2001
From: Angus Lees
Date: Tue, 8 Jun 2010 13:18:25 +0000
Subject: Remove unnecessary explicit _endian=little for Android

svn-id: r49504
---
 configure | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 0c06be13ea..cb2f690441 100755
--- a/configure
+++ b/configure
@@ -1665,7 +1665,6 @@ if test -n "$_host"; then
 			;;
 		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'
-- 
cgit v1.2.3


From 859212df2523e8b15076d968018dbf98618fd60f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 15 Jun 2010 10:44:51 +0000
Subject: Implement translation support for ScummVM GUI.

Based on patch #2903830: "Updated Translation Prototype" by alexbevi
which in turn is based on patch #1739965 by jvprat.

Currently it builds all translations right into ScummVM. Once the
feature will be accepted more widely, i.e. more translations will
pop up, it will be trivial to move translation strings to external
file.

Finished translation: Russian
Unfinished translation: Hungarian

Things which are nice to do:
 - Language code -> language mapping for more user friendness
 - Specifying fonts to be used with language
 - Updating of interface language without restart. It will require
   moving of much code to reflowLayout() methods for each dialog

The .po files must be in single byte encodings. I.e. no support
for Unicode.

svn-id: r49759
---
 configure | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index cb2f690441..56827b3855 100755
--- a/configure
+++ b/configure
@@ -136,6 +136,8 @@ _enable_prof=no
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
+# GUI translation options
+_translation=yes
 # Default platform settings
 _backend=sdl
 _endian=unknown
@@ -676,6 +678,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
 
@@ -760,6 +763,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  ;;
@@ -2312,6 +2317,47 @@ if test "$_keymapper" = yes ; then
 	DEFINES="$DEFINES -DENABLE_KEYMAPPER"
 fi
 
+# Check whether to build translation support
+#
+echo_n "Building translation support... "
+add_to_config_mk_if_yes $_translation 'ENABLE_TRANSLATION = 1'
+add_to_config_h_if_yes $_translation '#define 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
+
+	add_to_config_h_if_yes $_detectlang '#define DETECTLANG'
+	if test "$_detectlang" = yes ; then
+		echo_n "with runtime language detection, "
+
+		cat > $TMPC << EOF
+#include <langinfo.h>
+#include <iconv.h>
+int main(void) { nl_langinfo(CODESET); iconv_open(0, 0); return 0; }
+EOF
+		_termconv=no
+		cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
+		cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
+
+		add_to_config_h_if_yes $_termconv '#define TERMCONV'
+		if test "$_termconv" = yes ; then
+			echo "with terminal conversion)"
+		else
+			echo "without terminal conversion)"
+		fi
+	else
+		echo "without runtime language detection)"
+	fi
+fi
+
 #
 # Figure out installation directories
 #
-- 
cgit v1.2.3


From 0d7c8071cc8baed030d5f25203982e0613440412 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 15 Jun 2010 17:13:42 +0000
Subject: Fix iconv signature on BSD systems. (Based on what we do in tools/)

svn-id: r49868
---
 configure | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 56827b3855..c8a640bea2 100755
--- a/configure
+++ b/configure
@@ -2349,6 +2349,18 @@ EOF
 
 		add_to_config_h_if_yes $_termconv '#define TERMCONV'
 		if test "$_termconv" = yes ; then
+			uses_const=no
+			cat > $TMPC << EOF
+#include <iconv.h>
+int main(int argc, char **argv) {
+	iconv_t iconvP;
+	const char **inbuf = 0;
+	iconv(iconvP, inbuf, 0, 0, 0);
+	return 0;
+}
+EOF
+			cc_check $LDFLAGS $LIBS $CXXFLAGS && uses_const=yes
+			add_to_config_h_if_yes $uses_const '#define ICONV_USES_CONST'
 			echo "with terminal conversion)"
 		else
 			echo "without terminal conversion)"
-- 
cgit v1.2.3


From ee419aad9cb16e36248158a434831163a93731db Mon Sep 17 00:00:00 2001
From: John Willis
Date: Tue, 15 Jun 2010 17:49:40 +0000
Subject: GP2XWiz: Add port distribution rules into a makefile so they can be
 used with buildbot.

This removes them from the old scripts in /backends/platform/gp2xwiz/build/ and puts them in the right place as make targets.

svn-id: r49877
---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index c8a640bea2..954f812707 100755
--- a/configure
+++ b/configure
@@ -1505,6 +1505,7 @@ if test -n "$_host"; then
 			_build_hq_scalers="no"
 			_mt32emu="no"
 			_vkeybd="yes"
+			_port_mk="backends/platform/gp2xwiz/gp2xwiz-bundle.mk"
 			;;
 		iphone)
 			DEFINES="$DEFINES -DIPHONE -DUNIX"
-- 
cgit v1.2.3


From 6210b44eba8ec045a06a1ef272b9b1465652889f Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Tue, 15 Jun 2010 18:30:30 +0000
Subject: Fix linking of the cc_tests

svn-id: r49882
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 954f812707..cfeb6fe8df 100755
--- a/configure
+++ b/configure
@@ -1408,7 +1408,8 @@ case $_host_os in
 		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"
-- 
cgit v1.2.3


From 7360bea1ee55443c14639c13bc0b548bb941a705 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Tue, 15 Jun 2010 18:42:08 +0000
Subject: Fix linking of the cc_tests (gamecube too)

svn-id: r49884
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index cfeb6fe8df..095fbc3ab9 100755
--- a/configure
+++ b/configure
@@ -1355,7 +1355,8 @@ case $_host_os in
 		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"
-- 
cgit v1.2.3


From 49463c2bf95f8293746f2b6cb9420f313c6babf3 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 15 Jun 2010 19:20:58 +0000
Subject: Use USE_TRANSLATION, USE_DETECTLANG and USE_TERMCONV instead of
 (ENABLE_)TRANSLATION, DETECTLANG and TERMCONV.

svn-id: r49885
---
 configure | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 095fbc3ab9..7ccf36ca74 100755
--- a/configure
+++ b/configure
@@ -2323,8 +2323,8 @@ fi
 # Check whether to build translation support
 #
 echo_n "Building translation support... "
-add_to_config_mk_if_yes $_translation 'ENABLE_TRANSLATION = 1'
-add_to_config_h_if_yes $_translation '#define TRANSLATION'
+add_to_config_mk_if_yes $_translation 'USE_TRANSLATION = 1'
+add_to_config_h_if_yes $_translation '#define USE_TRANSLATION'
 if test "$_translation" = no ; then
 	echo "no"
 else
@@ -2337,7 +2337,7 @@ EOF
 	_detectlang=no
 	cc_check $LDFLAGS $CXXFLAGS && _detectlang=yes
 
-	add_to_config_h_if_yes $_detectlang '#define DETECTLANG'
+	add_to_config_h_if_yes $_detectlang '#define USE_DETECTLANG'
 	if test "$_detectlang" = yes ; then
 		echo_n "with runtime language detection, "
 
@@ -2350,7 +2350,7 @@ EOF
 		cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
 		cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
 
-		add_to_config_h_if_yes $_termconv '#define TERMCONV'
+		add_to_config_h_if_yes $_termconv '#define USE_TERMCONV'
 		if test "$_termconv" = yes ; then
 			uses_const=no
 			cat > $TMPC << EOF
-- 
cgit v1.2.3


From 2e9a7155e6ba4398a1594df4c21de97f29a99193 Mon Sep 17 00:00:00 2001
From: John Willis
Date: Tue, 15 Jun 2010 20:45:13 +0000
Subject: GP2X: Move port distribution rules into a makefile for use with
 buildbot.

This removes them from the old scripts in /backends/platform/gp2x/build/ and puts them in the right place.

svn-id: r49892
---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index 7ccf36ca74..3b8dbe2471 100755
--- a/configure
+++ b/configure
@@ -1492,6 +1492,7 @@ if test -n "$_host"; then
 			_build_hq_scalers="no"
 			_mt32emu="no"
 			_vkeybd="yes"
+			_port_mk="backends/platform/gp2x/gp2x-bundle.mk"
 			;;
 		gp2xwiz)
 			DEFINES="$DEFINES -DUNIX -DGP2XWIZ -DNDEBUG"
-- 
cgit v1.2.3


From e7e8808affc1a256b228da859e44ec3071c3a5a4 Mon Sep 17 00:00:00 2001
From: Yotam Barnoy
Date: Wed, 16 Jun 2010 09:04:27 +0000
Subject: PSP: got rid of SDL

svn-id: r49903
---
 configure | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 3b8dbe2471..41e6a46f44 100755
--- a/configure
+++ b/configure
@@ -2484,14 +2484,7 @@ 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"
 		;;
 	samsungtv)
 		find_sdlconfig
-- 
cgit v1.2.3


From 690203de7486b577dc8b34d1a2fa8b97b686d2f9 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Thu, 17 Jun 2010 18:54:37 +0000
Subject: Fix possible link error for scummvm-static (for MacOS X bundle) when
 USE_TRANSLATION is set but USE_TERMCONV is not.

svn-id: r49941
---
 configure | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configure')

diff --git a/configure b/configure
index 41e6a46f44..eeec7df204 100755
--- a/configure
+++ b/configure
@@ -2351,6 +2351,7 @@ EOF
 		cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
 		cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
 
+		add_to_config_mk_if_yes $_termconv 'USE_TERMCONV = 1'
 		add_to_config_h_if_yes $_termconv '#define USE_TERMCONV'
 		if test "$_termconv" = yes ; then
 			uses_const=no
-- 
cgit v1.2.3


From d783ca972abee9702e6abf31f13188fc59d7d32d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 24 Jun 2010 22:33:49 +0000
Subject: Disable addition of "SCUMMVM_SVN_REVISION" to the version string, in
 case --enable-release was specified on configure run.

svn-id: r50246
---
 configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index eeec7df204..d8d7ef8591 100755
--- a/configure
+++ b/configure
@@ -1042,7 +1042,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
 
 
-- 
cgit v1.2.3


From 58fcda82f33e3ba8f813eeac412612ae09a34c9f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 26 Jun 2010 18:07:41 +0000
Subject: Remove support for translation of console messages.

In recent discussions on -devel it turned out, that this
feature is rather superfluous and instead we should rather
implement a proper error reporting in our GUI.

I also removed the dependency on iconv along with this.

svn-id: r50335
---
 configure | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index d8d7ef8591..a8432fc8b8 100755
--- a/configure
+++ b/configure
@@ -2342,36 +2342,7 @@ EOF
 
 	add_to_config_h_if_yes $_detectlang '#define USE_DETECTLANG'
 	if test "$_detectlang" = yes ; then
-		echo_n "with runtime language detection, "
-
-		cat > $TMPC << EOF
-#include <langinfo.h>
-#include <iconv.h>
-int main(void) { nl_langinfo(CODESET); iconv_open(0, 0); return 0; }
-EOF
-		_termconv=no
-		cc_check_no_clean $LDFLAGS $CXXFLAGS && _termconv=yes
-		cc_check $LDFLAGS $CXXFLAGS -liconv && LIBS="$LIBS -liconv" && _termconv=yes
-
-		add_to_config_mk_if_yes $_termconv 'USE_TERMCONV = 1'
-		add_to_config_h_if_yes $_termconv '#define USE_TERMCONV'
-		if test "$_termconv" = yes ; then
-			uses_const=no
-			cat > $TMPC << EOF
-#include <iconv.h>
-int main(int argc, char **argv) {
-	iconv_t iconvP;
-	const char **inbuf = 0;
-	iconv(iconvP, inbuf, 0, 0, 0);
-	return 0;
-}
-EOF
-			cc_check $LDFLAGS $LIBS $CXXFLAGS && uses_const=yes
-			add_to_config_h_if_yes $uses_const '#define ICONV_USES_CONST'
-			echo "with terminal conversion)"
-		else
-			echo "without terminal conversion)"
-		fi
+		echo_n "with runtime language detection)"
 	else
 		echo "without runtime language detection)"
 	fi
-- 
cgit v1.2.3


From 78b6e246df844ea7f38d1c879ddc5dbeb767938c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 1 Jul 2010 16:26:00 +0000
Subject: Fix configure output (missing newline)

svn-id: r50556
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index a8432fc8b8..2674c0af18 100755
--- a/configure
+++ b/configure
@@ -2342,7 +2342,7 @@ EOF
 
 	add_to_config_h_if_yes $_detectlang '#define USE_DETECTLANG'
 	if test "$_detectlang" = yes ; then
-		echo_n "with runtime language detection)"
+		echo "with runtime language detection)"
 	else
 		echo "without runtime language detection)"
 	fi
-- 
cgit v1.2.3


From 762ff57e0dd906e7a256c1d832c67f345faf8883 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 1 Jul 2010 23:12:28 +0000
Subject: NDS: Some tweaks for compiling via std build system

svn-id: r50582
---
 configure | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 2674c0af18..4741340e09 100755
--- a/configure
+++ b/configure
@@ -1138,9 +1138,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
@@ -1389,7 +1392,7 @@ case $_host_os in
 		;;
 	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 @@ if test -n "$_host"; then
 			# 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 @@ case $_backend in
 		;;
 	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 @@ 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)
+		mingw* | dreamcast | wii | gamecube | nds | psp | wince | amigaos* | android)
 			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
 			;;
 		*)
-- 
cgit v1.2.3


From b8778fc7c382ec401409bbaafcb67355f0c566e3 Mon Sep 17 00:00:00 2001
From: Angus Lees
Date: Mon, 5 Jul 2010 01:00:59 +0000
Subject: Switch Android toolchain prefix from arm-android-eabi to
 arm-*-linux-androideabi, since this is what the upcoming gcc-4.6 change uses.
 Work around Android 2.0 and newer dynamic linker bug by explicitly linking
 plugins against the core libscummvm.so. Mark Android packages as preferring
 to be on external storage. Move -lm from LDFLAGS to LIBS.

svn-id: r50665
---
 configure | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 4741340e09..f79bc083c2 100755
--- a/configure
+++ b/configure
@@ -1007,7 +1007,7 @@ wince)
 android)
 	_host_os=android
 	_host_cpu=arm
-	_host_alias=arm-android-eabi
+	_host_alias=arm-oe-linux-androideabi
 	;;
 *)
 	if test -n "$_host"; then
@@ -1687,7 +1687,6 @@ if test -n "$_host"; then
 			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"
@@ -1990,7 +1989,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
@@ -2494,12 +2493,36 @@ case $_backend in
 		LIBS="$LIBS -static -lSDL"
 		;;
 	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="$LIBS -lgcc -lstdc++ -llog -lGLESv1_CM -lEGL"
+		LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -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'
+
+		# 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'
 		;;
 	*)
 		echo "support for $_backend backend not implemented in configure script yet"
-- 
cgit v1.2.3


From 179a2b4e88842b04eec46aa29c7c4a88123b5a50 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 5 Jul 2010 10:06:38 +0000
Subject: NDS: Rename backend 'nds' to 'ds' in configure

svn-id: r50670
---
 configure | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index f79bc083c2..ced19f62bb 100755
--- a/configure
+++ b/configure
@@ -343,7 +343,7 @@ get_system_exe_extension() {
 	arm-riscos)
 		_exeext=",ff8"
 		;;
-	dreamcast | gamecube | nds | ps2 | psp | wii)
+	dreamcast | gamecube | ds | ps2 | psp | wii)
 		_exeext=".elf"
 		;;
 	gp2x-linux)
@@ -627,7 +627,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:
@@ -657,7 +657,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
@@ -949,8 +949,8 @@ motomagx)
 	_host_cpu=arm
 	_host_alias=arm-linux-gnueabi
 	;;
-nds)
-	_host_os=nds
+ds)
+	_host_os=ds
 	_host_cpu=arm
 	_host_alias=arm-eabi
 	;;
@@ -1070,7 +1070,7 @@ esac
 # Platform specific sanity checks
 #
 case $_host_os in
-gamecube | nds | wii)
+gamecube | ds | wii)
 	if test -z "$DEVKITPRO"; then
 		echo "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to devkitPRO>"
 		exit 1
@@ -1390,8 +1390,8 @@ case $_host_os in
 	mint*)
 		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		;;
-	nds)
-		# TODO nds
+	ds)
+		# TODO Nintendo DS
 		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT -I$DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
 		;;
 	os2-emx*)
@@ -1570,15 +1570,14 @@ if test -n "$_host"; then
 			_vkeybd="yes"
 			_port_mk="backends/platform/linuxmoto/linuxmoto.mk"
 			;;
-		nds)
+		ds)
 			# 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 -DSTREAM_AUDIO_FROM_DISK"
 			DEFINES="$DEFINES -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
 			_need_memalign=yes
-			_backend="nds"
+			_backend="ds"
 			_build_hq_scalers="no"
 			_mt32emu="no"
 			_port_mk="backends/platform/ds/ds.mk"
@@ -2444,8 +2443,8 @@ case $_backend in
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
 		DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO"
 		;;
-	nds)
-		# TODO nds
+	ds)
+		# TODO ds
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source -I$(srcdir)/backends/platform/ds/commoninclude'
 		;;
 	null)
@@ -2539,7 +2538,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 | nds | psp | wince | amigaos* | android)
+		mingw* | dreamcast | wii | gamecube | ds | psp | wince | amigaos* | android)
 			CXXFLAGS="$CXXFLAGS -W -Wno-unused-parameter"
 			;;
 		*)
-- 
cgit v1.2.3


From a9af5324489a88b34788baca0c29bbcf3a57f3bd Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 5 Jul 2010 10:07:33 +0000
Subject: DS: Can now build binaries via our "configure/make" build system.

Conversion of the old build system is incomplete. Binaries created
using this new build system support most likely will not run!
More work is needed, but the work done so far should be enough
to get basic NDS support on our buildbot working.

svn-id: r50672
---
 configure | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index ced19f62bb..aaa8e1aee4 100755
--- a/configure
+++ b/configure
@@ -1392,7 +1392,12 @@ case $_host_os in
 		;;
 	ds)
 		# TODO Nintendo DS
-		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT -I$DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
+		DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
+		CXXFLAGS="$CXXFLAGS -isystem $DEVKITPRO/libnds/include -isystem $DEVKITPRO/devkitARM/arm-eabi/include"
+		CXXFLAGS="$CXXFLAGS -mthumb-interwork -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"
 		;;
 	os2-emx*)
 		DEFINES="$DEFINES -DUNIX"
@@ -1575,18 +1580,18 @@ if test -n "$_host"; then
 			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"
 			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_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'
 			;;
 		neuros)
 			DEFINES="$DEFINES -DUNIX -DNEUROS"
@@ -2445,7 +2450,9 @@ case $_backend in
 		;;
 	ds)
 		# TODO ds
-		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source -I$(srcdir)/backends/platform/ds/commoninclude'
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
+		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
+		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
 		;;
 	null)
 		DEFINES="$DEFINES -DUSE_NULL_DRIVER"
-- 
cgit v1.2.3


From 330e94feeda00ed0d55aaa899349efa26683257c Mon Sep 17 00:00:00 2001
From: Angus Lees
Date: Mon, 5 Jul 2010 13:06:58 +0000
Subject: Drop direct use of (private) libEGL.so and call EGL functions via
 Java. This removes the final private library - we should be completely above
 board now.

svn-id: r50677
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index aaa8e1aee4..08613d2232 100755
--- a/configure
+++ b/configure
@@ -2515,7 +2515,7 @@ case $_backend in
 		# -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 -lEGL"
+		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'
 
-- 
cgit v1.2.3