From c58e2707ffa147f099e3eaf32c941da9cdc47dda Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Sat, 14 Aug 2010 00:56:12 +0000
Subject: WII: Update port for the current versions of the base libraries.
 Enable DVD access for the GameCube port.

svn-id: r52074
---
 configure | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index db01465db0..f0b00c9718 100755
--- a/configure
+++ b/configure
@@ -1410,9 +1410,9 @@ case $_host_os in
 	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"
+		CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include"
 		# 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"
+		LDFLAGS="$LDFLAGS -mogc -mcpu=750 -L$DEVKITPRO/libogc/lib/cube -logc"
 		;;
 	haiku*)
 		DEFINES="$DEFINES -DSYSTEM_NOT_SUPPORTING_D_TYPE"
@@ -1470,9 +1470,9 @@ case $_host_os in
 	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"
+		CXXFLAGS="$CXXFLAGS -I$DEVKITPRO/libogc/include"
 		# 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"
+		LDFLAGS="$LDFLAGS -mrvl -mcpu=750 -L$DEVKITPRO/libogc/lib/wii -logc"
 		;;
 	wince)
 		CXXFLAGS="$CXXFLAGS -O3 -march=armv4 -mtune=xscale"
@@ -1565,6 +1565,7 @@ if test -n "$_host"; then
 			add_line_to_config_h "/* #define DEBUG_WII_USBGECKO */"
 			add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"
 			add_line_to_config_h "/* #define DEBUG_WII_GDB */"
+			add_line_to_config_h "#define USE_WII_DI"
 			;;
 		gp2x)
 			DEFINES="$DEFINES -DGP2X -DNDEBUG"
@@ -2583,10 +2584,10 @@ case $_backend in
 		DEFINES="$DEFINES -D__WII__ -DGEKKO"
 		case $_host_os in
 		gamecube)
-			LIBS="$LIBS -lgxflux -lfat -logc -ldb"
+			LIBS="$LIBS -lgxflux -liso9660 -lfat -logc -ldb"
 			;;
 		*)
-			LIBS="$LIBS -lgxflux -ldi -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb"
+			LIBS="$LIBS -lgxflux -ldi -liso9660 -ltinysmb -lfat -lwiiuse -lbte -logc -lwiikeyboard -ldb"
 			;;
 		esac
 		;;
-- 
cgit v1.2.3


From 06960d33e15bc80f9912fa92f11dd82388199bd6 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Aug 2010 09:28:20 +0000
Subject: HUGO: Adding engine to the main tree

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

(limited to 'configure')

diff --git a/configure b/configure
index f0b00c9718..8c6c0c7e65 100755
--- a/configure
+++ b/configure
@@ -88,6 +88,7 @@ add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine gob "Gobli*ns" yes
 add_engine groovie "Groovie" yes "groovie2"
 add_engine groovie2 "Groovie 2 games" no
+add_engine hugo "Hugo Trilogy" no
 add_engine kyra "Legend of Kyrandia" yes "lol"
 add_engine lol "Lands of Lore" no
 add_engine lure "Lure of the Temptress" yes
-- 
cgit v1.2.3


From 981abdd08bf47fff9a237056cdf82aa11cca60b1 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Aug 2010 11:19:34 +0000
Subject: CONFIGURE: Remove trailing space (and kick buildbot)

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

(limited to 'configure')

diff --git a/configure b/configure
index 8c6c0c7e65..c9769d41b4 100755
--- a/configure
+++ b/configure
@@ -1447,7 +1447,7 @@ case $_host_os in
 		_unix=yes
 		;;
 	n64)
-		DEFINES="$DEFINES -D__N64__ -DLIMIT_FPS -DNONSTANDARD_PORT" 
+		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"
 		;;
-- 
cgit v1.2.3


From 56ec4fc353fc0fddaa3d046cbeeb9393c16c453a Mon Sep 17 00:00:00 2001
From: John Willis
Date: Tue, 17 Aug 2010 11:40:48 +0000
Subject: CONFIGURE: Add plugin support for the GP2X backend.

I'll switch the GP2X to use plugins by default for new releases after some additional testing.

svn-id: r52153
---
 configure | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index c9769d41b4..d7c286f15d 100755
--- a/configure
+++ b/configure
@@ -1944,6 +1944,24 @@ CXXFLAGS        += -fpic
 PLUGIN_LDFLAGS  += -shared
 PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
 POST_OBJS_FLAGS := -Wl,-no-whole-archive
+'
+		;;
+	gp2x*)
+_def_plugin='
+#define PLUGIN_PREFIX	""
+#define PLUGIN_SUFFIX	".plugin"
+'
+_mak_plugins='
+DYNAMIC_MODULES := 1
+PLUGIN_PREFIX :=
+PLUGIN_SUFFIX := .plugin
+PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
+CXXFLAGS        += -DDYNAMIC_MODULES
+CXXFLAGS        += -fpic
+PLUGIN_LDFLAGS  += -shared
+PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
+POST_OBJS_FLAGS := -Wl,-no-whole-archive
+LIBS            += -ldl
 '
 		;;
 	gp2xwiz*)
-- 
cgit v1.2.3


From c6d56f2c02ae8a2b24c52c4284eba69dea242934 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Aug 2010 13:00:48 +0000
Subject: CONFIGURE: Add -Wglobal-constructors to Darwin builds.

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

(limited to 'configure')

diff --git a/configure b/configure
index d7c286f15d..608fad7b6f 100755
--- a/configure
+++ b/configure
@@ -1386,6 +1386,7 @@ case $_host_os in
 		;;
 	darwin*)
 		DEFINES="$DEFINES -DMACOSX"
+		CXXFLAGS="$CXXFLAGS -Wglobal-constructors"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'
 		_unix=yes
-- 
cgit v1.2.3


From bec56837ebc5919d7d421e99252f38c2a19c1d6e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Aug 2010 13:51:36 +0000
Subject: CONFIGURE: Properly detect -Wglobal-constructors

svn-id: r52157
---
 configure | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 608fad7b6f..b915ba08c7 100755
--- a/configure
+++ b/configure
@@ -136,6 +136,7 @@ _build_hq_scalers=yes
 _indeo3=auto
 _enable_prof=no
 _unix=no
+_global_constructors=no
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
@@ -1264,6 +1265,17 @@ if test "$cxx_verc_fail" = yes ; then
 	exit 1
 fi
 
+echocheck "whether -Wglobal-constructors work"
+cat > $TMPC << EOF
+int main() { return 0; }
+EOF
+cc_check -Wglobal-constructors && _global_constructors=yes
+
+if test "$_global_constructors" = yes; then
+	CXXFLAGS="$CXXFLAGS -Wglobal-constructors"
+fi
+echo $_global_constructors
+
 #
 # Check for endianness
 #
@@ -1386,7 +1398,6 @@ case $_host_os in
 		;;
 	darwin*)
 		DEFINES="$DEFINES -DMACOSX"
-		CXXFLAGS="$CXXFLAGS -Wglobal-constructors"
 		LIBS="$LIBS -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI"
 		add_line_to_config_mk 'MACOSX = 1'
 		_unix=yes
-- 
cgit v1.2.3


From 26dc4c24256472898f4388de73699a5f54f4a2cf Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 19 Aug 2010 12:43:37 +0000
Subject: DINGOO: new port. Patch #3039277

svn-id: r52210
---
 configure | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index b915ba08c7..ed2678c93a 100755
--- a/configure
+++ b/configure
@@ -932,6 +932,11 @@ arm-riscos)
 	_host_os=riscos
 	_host_cpu=arm
 	;;
+dingux)
+	_host_os=linux
+	_host_cpu=mipsel
+	_host_alias=mipsel-linux
+	;;
 dreamcast)
 	_host_os=dreamcast
 	_host_cpu=sh
@@ -1537,6 +1542,17 @@ if test -n "$_host"; then
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
 			;;
+		dingux)
+			DEFINES="$DEFINES -DUNIX -DDINGUX -DDISABLE_DOSBOX_OPL"
+			ASFLAGS="$ASFLAGS"
+			CXXFLAGS="$CXXFLAGS -msoft-float -mips32"
+			_need_memalign=yes
+			_backend="dingux"
+			_mt32emu=no
+			_vkeybd=yes
+			_build_hq_scalers=no
+			_keymapper=no
+			;;
 		dreamcast)
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
 			CXXFLAGS="$CXXFLAGS -O3 -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks"
@@ -1852,7 +1868,7 @@ fi
 # Enable 16bit support only for backends which support it
 #
 case $_backend in
-	dreamcast | samsungtv | sdl | wii | psp)
+	dreamcast | dingux | samsungtv | sdl | wii | psp)
 		if test "$_16bit" = auto ; then
 			_16bit=yes
 		else
@@ -2544,6 +2560,14 @@ case $_backend in
 		LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
 		LIBS="$LIBS -lronin -lm"
 		;;
+	dingux)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		DEFINES="$DEFINES -DSDL_BACKEND -DDINGUX"
+		LDFLAGS="$LDFLAGS "
+		MODULES="$MODULES backends/platform/sdl"
+		;;
 	ds)
 		# TODO ds
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/arm9/source'
-- 
cgit v1.2.3


From c427ecb7ccdd88b02712eb2f357d44fb999236df Mon Sep 17 00:00:00 2001
From: Fabio Battaglia
Date: Thu, 19 Aug 2010 15:13:03 +0000
Subject: DINGUX: disable check for vorbis, because of terrible performance
 compared to tremor

svn-id: r52212
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index ed2678c93a..1cde781fe8 100755
--- a/configure
+++ b/configure
@@ -1552,6 +1552,8 @@ if test -n "$_host"; then
 			_vkeybd=yes
 			_build_hq_scalers=no
 			_keymapper=no
+			# Force disable vorbis on dingux, it has terrible performance compared to tremor
+			_vorbis=no
 			;;
 		dreamcast)
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
-- 
cgit v1.2.3


From 4625defaa46b438a0e70365773f9c54e887149b0 Mon Sep 17 00:00:00 2001
From: Fabio Battaglia
Date: Fri, 20 Aug 2010 05:06:07 +0000
Subject: CONFIGURE: force disable seq midi for dingux port

svn-id: r52219
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 1cde781fe8..5739e38a3f 100755
--- a/configure
+++ b/configure
@@ -1554,6 +1554,8 @@ if test -n "$_host"; then
 			_keymapper=no
 			# Force disable vorbis on dingux, it has terrible performance compared to tremor
 			_vorbis=no
+			# Force disable seq on dingux, no way to use it and it would get enabled by default with configure
+			_seq_midi=no
 			;;
 		dreamcast)
 			DEFINES="$DEFINES -DDISABLE_DEFAULT_SAVEFILEMANAGER -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE"
-- 
cgit v1.2.3


From f2ed796ba3502ec914044eb6ada905329eea3692 Mon Sep 17 00:00:00 2001
From: Fabio Battaglia
Date: Tue, 24 Aug 2010 17:56:33 +0000
Subject: CONFIGURE: don't force vkeybd for n64 port

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

(limited to 'configure')

diff --git a/configure b/configure
index 5739e38a3f..6239a5b743 100755
--- a/configure
+++ b/configure
@@ -1709,7 +1709,6 @@ if test -n "$_host"; then
 			_backend="n64"
 			_need_memalign=yes
 			_mt32emu=no
-			_vkeybd=yes
 			_build_scalers=no
 			_indeo3=no
 			_translation=no
-- 
cgit v1.2.3


From 922510df7e1b80c998532da66ae621ecacaed0f2 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Tue, 24 Aug 2010 18:44:14 +0000
Subject: SOUND: New global define AUDIO_REVERSE_STEREO.

This reverses the stereo channels for all sfx streams, meant for
hardware devices which expect an inverse order. Use it for the Wii
and Gamecube port since it's reversed since day one :P

svn-id: r52357
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 6239a5b743..453e3a6d30 100755
--- a/configure
+++ b/configure
@@ -1594,6 +1594,7 @@ if test -n "$_host"; then
 			_mt32emu=no
 			_port_mk="backends/platform/wii/wii.mk"
 			add_line_to_config_mk 'GAMECUBE = 1'
+			add_line_to_config_h '#define AUDIO_REVERSE_STEREO'
 			add_line_to_config_h '#define GAMECUBE'
 			add_line_to_config_h "/* #define DEBUG_WII_USBGECKO */"
 			add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"
@@ -1793,6 +1794,7 @@ if test -n "$_host"; then
 			_build_scalers=no
 			_port_mk="backends/platform/wii/wii.mk"
 			add_line_to_config_mk 'GAMECUBE = 0'
+			add_line_to_config_h '#define AUDIO_REVERSE_STEREO'
 			add_line_to_config_h "#define DEBUG_WII_USBGECKO"
 			add_line_to_config_h "/* #define DEBUG_WII_MEMSTATS */"
 			add_line_to_config_h "/* #define DEBUG_WII_GDB */"
-- 
cgit v1.2.3


From c36ba08424342fb0567651442edd3f9c289ca9a3 Mon Sep 17 00:00:00 2001
From: John Willis
Date: Thu, 26 Aug 2010 11:28:30 +0000
Subject: CONFIGURE: Add support for building for the GPH Caanoo.

The Caanoo is based on the GP2XWIZ backend but needs to be a seperate
target as it uses a different toolchain/libs etc. 

svn-id: r52401
---
 configure | 55 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 20 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 453e3a6d30..ab33fee136 100755
--- a/configure
+++ b/configure
@@ -364,6 +364,9 @@ get_system_exe_extension() {
 	arm-riscos)
 		_exeext=",ff8"
 		;;
+	caanoo-linux)
+		_exeext=".caanoo"
+		;;		
 	dreamcast | ds | gamecube | n64 | ps2 | psp | wii)
 		_exeext=".elf"
 		;;
@@ -647,7 +650,7 @@ Usage: $0 [OPTIONS]...
 
 Configuration:
   -h, --help              display this help and exit
-  --backend=BACKEND       backend to build (dc, gp2x, gp2xwiz, iphone,
+  --backend=BACKEND       backend to build (caanoo, dc, gp2x, gp2xwiz, iphone,
                           linuxmoto, ds, null, ps2, psp, sdl, wii, wince)
                           [sdl]
 
@@ -932,6 +935,11 @@ arm-riscos)
 	_host_os=riscos
 	_host_cpu=arm
 	;;
+caanoo)
+	_host_os=caanoo-linux
+	_host_cpu=arm
+	_host_alias=arm-none-linux-gnueabi
+	;;
 dingux)
 	_host_os=linux
 	_host_cpu=mipsel
@@ -1538,6 +1546,24 @@ if test -n "$_host"; then
 		bfin*)
 			_need_memalign=yes
 			;;
+		caanoo)
+			DEFINES="$DEFINES -DGP2XWIZ -DCAANOO -DNDEBUG"
+			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
+			ASFLAGS="$ASFLAGS"
+			_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_COSTUME_ASM = 1'
+			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
+			_backend="gp2xwiz"
+			_build_hq_scalers=no
+			_mt32emu=no
+			_vkeybd=yes
+			_seq_midi=no
+			_port_mk="backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk"
+			;;			
 		*darwin*)
 			_ranlib=$_host-ranlib
 			_strip=$_host-strip
@@ -1979,25 +2005,7 @@ PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
 POST_OBJS_FLAGS := -Wl,-no-whole-archive
 '
 		;;
-	gp2x*)
-_def_plugin='
-#define PLUGIN_PREFIX	""
-#define PLUGIN_SUFFIX	".plugin"
-'
-_mak_plugins='
-DYNAMIC_MODULES := 1
-PLUGIN_PREFIX :=
-PLUGIN_SUFFIX := .plugin
-PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-CXXFLAGS        += -DDYNAMIC_MODULES
-CXXFLAGS        += -fpic
-PLUGIN_LDFLAGS  += -shared
-PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
-POST_OBJS_FLAGS := -Wl,-no-whole-archive
-LIBS            += -ldl
-'
-		;;
-	gp2xwiz*)
+	gp2x* | gp2xwiz* | caanoo*)
 _def_plugin='
 #define PLUGIN_PREFIX	""
 #define PLUGIN_SUFFIX	".plugin"
@@ -2560,6 +2568,13 @@ case $_backend in
 		add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm'
 		add_line_to_config_mk 'PLUGIN_EXTRA_DEPS += build.tmp/libscummvm.so'
 		;;
+	caanoo)
+		find_sdlconfig
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
+		LDFLAGS="$LDFLAGS"
+		CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
+		;;		
 	dc)
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
 		LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
-- 
cgit v1.2.3


From b5a17ca628e984fa13190c64fb5caef6108369ca Mon Sep 17 00:00:00 2001
From: Yotam Barnoy
Date: Tue, 31 Aug 2010 15:24:08 +0000
Subject: PSP: fix BS2 crash by disabling strict aliasing

The problem that caused the crash in BS2 had to do with GCC making improper assumptions about our code. Specifically, the alignment trick we use for READ_UINT32/16 allows some targets(e.g. MIPS) to generate better code, but it also goes against ANSI C aliasing rules, which prohibit the sharing of addresses between a struct and another variable value. Using -fno-strict-aliasing tells GCC not to assume strict ANSI C aliasing and also unfortunately prevents it from making some good optimizations.

This change is probably needed for other platforms as well -- the crash on the PSP was simply a very rare coincidence.

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

(limited to 'configure')

diff --git a/configure b/configure
index ab33fee136..d737b6ecad 100755
--- a/configure
+++ b/configure
@@ -1485,7 +1485,7 @@ case $_host_os in
 		DEFINES="$DEFINES -D_EE -D__PLAYSTATION2__"
 		;;
 	psp)
-		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
+		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150 -fno-strict-aliasing"
 		;;
 	solaris*)
 		DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-- 
cgit v1.2.3


From 43bbfa5ca8d384f601ef91f69d7d6bd6f3bba5cd Mon Sep 17 00:00:00 2001
From: Yotam Barnoy
Date: Wed, 1 Sep 2010 12:56:34 +0000
Subject: PSP: removed strict-aliasing

It's no longer needed after adding __may_alias__ flag in endian.h.

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

(limited to 'configure')

diff --git a/configure b/configure
index d737b6ecad..ab33fee136 100755
--- a/configure
+++ b/configure
@@ -1485,7 +1485,7 @@ case $_host_os in
 		DEFINES="$DEFINES -D_EE -D__PLAYSTATION2__"
 		;;
 	psp)
-		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150 -fno-strict-aliasing"
+		CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
 		;;
 	solaris*)
 		DEFINES="$DEFINES -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
-- 
cgit v1.2.3


From 7248efb178cdb33c107cc0ff183eb74c79236a59 Mon Sep 17 00:00:00 2001
From: Andre Heider
Date: Sat, 4 Sep 2010 22:19:20 +0000
Subject: DS: Enable stdout/err via nocash when DISABLE_COMMAND_LINE in not
 set.

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

(limited to 'configure')

diff --git a/configure b/configure
index ab33fee136..d8d3c86e2d 100755
--- a/configure
+++ b/configure
@@ -1600,13 +1600,14 @@ if test -n "$_host"; then
 			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"
 			_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'
+			add_line_to_config_h '#define DISABLE_TEXT_CONSOLE'
 			_backend="ds"
 			_build_scalers=no
 			_mt32emu=no
-- 
cgit v1.2.3