CONFIGURE: Rework GP2X/Wiz/Caanoo and OpenPandora builds.

Just some small cleanup to make the building of debug and
release builds follow the convention expected from the 
configure flags.

svn-id: r52821

1 files changed, 72 insertions, 10 deletions

diff --git a/configure b/configure
index 89b72759a9..31d43b97ba 100755
--- a/configure
+++ b/configure
@@ -939,9 +939,18 @@ arm-riscos)
 	_host_cpu=arm
 	;;
 caanoo)
-	_host_os=caanoo-linux
+	_host_os=gph-linux
 	_host_cpu=arm
 	_host_alias=arm-none-linux-gnueabi
+	if test "$_debug_build" = auto; then
+		# If you want to debug on the Caanoo use '--disable-release --enable-debug'
+		_debug_build=no
+	fi
+
+	if test "$_release_build" = auto; then
+		# Enable release build by default.
+		_release_build=yes
+	fi	
 	;;
 dingux)
 	_host_os=linux
@@ -966,14 +975,32 @@ gamecube)
 	_host_alias=powerpc-gekko
 	;;
 gp2x)
-	_host_os=gp2x-linux
+	_host_os=gph-linux
 	_host_cpu=arm
 	_host_alias=arm-open2x-linux
+	if test "$_debug_build" = auto; then
+		# If you want to debug on the GP2X use '--disable-release --enable-debug'
+		_debug_build=no
+	fi
+
+	if test "$_release_build" = auto; then
+		# Enable release build by default.
+		_release_build=yes
+	fi	
 	;;
 gp2xwiz)
-	_host_os=gp2xwiz-linux
+	_host_os=gph-linux
 	_host_cpu=arm
 	_host_alias=arm-open2x-linux
+	if test "$_debug_build" = auto; then
+		# If you want to debug on the GP2XWiz use '--disable-release --enable-debug'
+		_debug_build=no
+	fi
+
+	if test "$_release_build" = auto; then
+		# Enable release build by default.
+		_release_build=yes
+	fi	
 	;;
 i586-mingw32msvc)
 	_host_os=mingw32msvc
@@ -1008,9 +1035,18 @@ neuros)
 	_host_cpu=arm
 	;;
 openpandora)
-	_host_os=openpandora-linux
+	_host_os=linux
 	_host_cpu=arm
 	_host_alias=arm-angstrom-linux-gnueabi
+	if test "$_debug_build" = auto; then
+		# If you want to debug on the OP use '--disable-release --enable-debug'
+		_debug_build=no
+	fi
+
+	if test "$_release_build" = auto; then
+		# Enable release build by default.
+		_release_build=yes
+	fi	
 	;;
 ppc-amigaos)
 	_host_os=amigaos
@@ -1555,7 +1591,15 @@ if test -n "$_host"; then
 			_need_memalign=yes
 			;;
 		caanoo)
-			DEFINES="$DEFINES -DCAANOO -DNDEBUG"
+			DEFINES="$DEFINES -DCAANOO -DREDUCE_MEMORY_USAGE"
+			# Disable DOSBOX OPL for now.
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"	
+			if test "$_debug_build" = yes; then
+				DEFINES="$DEFINES -DGPH_DEBUG"
+			else
+				# Use -O3 on the Caanoo for non-debug builds.
+				CXXFLAGS="$CXXFLAGS -O3"
+			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS"
 			_unix=yes
@@ -1638,7 +1682,12 @@ if test -n "$_host"; then
 			add_line_to_config_h "#define USE_WII_DI"
 			;;
 		gp2x)
-			DEFINES="$DEFINES -DGP2X -DNDEBUG"
+			DEFINES="$DEFINES -DGP2X -DREDUCE_MEMORY_USAGE"
+			# Disable DOSBOX OPL for now.
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"	
+			if test "$_debug_build" = yes; then
+				DEFINES="$DEFINES -DGPH_DEBUG"
+			fi
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
@@ -1657,7 +1706,12 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/gp2x/gp2x-bundle.mk"
 			;;
 		gp2xwiz)
-			DEFINES="$DEFINES -DGP2XWIZ -DNDEBUG"
+			DEFINES="$DEFINES -DGP2XWIZ -DREDUCE_MEMORY_USAGE"
+			# Disable DOSBOX OPL for now.
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"
+			if test "$_debug_build" = yes; then
+				DEFINES="$DEFINES -DGPH_DEBUG"
+			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_unix=yes
@@ -1769,7 +1823,15 @@ if test -n "$_host"; then
 			_mt32emu=no
 			;;
 		openpandora)
-			DEFINES="$DEFINES -DOPENPANDORA -DNDEBUG"
+			DEFINES="$DEFINES -DOPENPANDORA -DREDUCE_MEMORY_USAGE"
+			# Disable DOSBOX OPL for now.
+			DEFINES="$DEFINES -DDISABLE_DOSBOX_OPL"			
+			if test "$_release_build" = no; then
+				DEFINES="$DEFINES -DOP_DEBUG"
+			else
+				# Use -O3 on the OpenPandora for non-debug builds.
+				CXXFLAGS="$CXXFLAGS -O3"
+			fi
 			CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			_unix=yes
@@ -2034,7 +2096,7 @@ PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
 POST_OBJS_FLAGS := -Wl,-no-whole-archive
 '
 		;;
-	gp2x* | gp2xwiz* | caanoo* | openpandora*)
+	gph*)
 _def_plugin='
 #define PLUGIN_PREFIX	""
 #define PLUGIN_SUFFIX	".plugin"
@@ -2620,7 +2682,7 @@ case $_backend in
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
-		LDFLAGS="$LDFLAGS -static"
+		LDFLAGS="$LDFLAGS"
 		;;
 	gph)
 		find_sdlconfig