[Scummvm-cvs-logs] scummvm master -> e7ae58f2e47b32b77c9165d73e7e8a556bd710b5

[djwillis]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e7ae58f2e4 CONFIGURE: Set DISABLE_SAVELOADCHOOSER_GRID for the GPH backend.


Commit: e7ae58f2e47b32b77c9165d73e7e8a556bd710b5
    https://github.com/scummvm/scummvm/commit/e7ae58f2e47b32b77c9165d73e7e8a556bd710b5
Author: David-John Willis (John.Willis at Distant-earth.com)
Date: 2012-08-16T02:57:44-07:00

Commit Message:
CONFIGURE: Set DISABLE_SAVELOADCHOOSER_GRID for the GPH backend.

* Move some backend settings from the host selection to the backend.
* Also remove stale referances to the old GP2X backend.

Changed paths:
    configure



diff --git a/configure b/configure
index 06492ff..d4fec02 100755
--- a/configure
+++ b/configure
@@ -712,7 +712,7 @@ Usage: $0 [OPTIONS]...
 
 Configuration:
   -h, --help              display this help and exit
-  --backend=BACKEND       backend to build (android, bada, dc, dingux, ds, gp2x, gph,
+  --backend=BACKEND       backend to build (android, bada, dc, dingux, ds, gph,
                           iphone, linuxmoto, maemo, n64, null, openpandora, ps2,
                           psp, samsungtv, sdl, webos, wii, wince) [sdl]
 
@@ -2202,13 +2202,8 @@ if test -n "$_host"; then
 		bfin*)
 			;;
 		caanoo)
-			# This uses the GPH backend.
-			DEFINES="$DEFINES -DGPH_DEVICE"
 			DEFINES="$DEFINES -DCAANOO"
-			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
-			if test "$_debug_build" = yes; then
-				DEFINES="$DEFINES -DGPH_DEBUG"
-			else
+			if test "$_debug_build" = no; then
 				# Use -O3 on the Caanoo for non-debug builds.
 				_optimization_level=-O3
 			fi
@@ -2299,13 +2294,7 @@ if test -n "$_host"; then
 			add_line_to_config_h "#define USE_WII_DI"
 			;;
 		gp2x)
-			# This uses the GPH backend.
-			DEFINES="$DEFINES -DGPH_DEVICE"
 			DEFINES="$DEFINES -DGP2X"
-			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
-			if test "$_debug_build" = yes; then
-				DEFINES="$DEFINES -DGPH_DEBUG"
-			fi
 			CXXFLAGS="$CXXFLAGS -march=armv4t"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
 			LDFLAGS="$LDFLAGS -static"
@@ -2319,13 +2308,7 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/gph/gp2x-bundle.mk"
 			;;
 		gp2xwiz)
-			# This uses the GPH backend.
-			DEFINES="$DEFINES -DGPH_DEVICE"
 			DEFINES="$DEFINES -DGP2XWIZ"
-			DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
-			if test "$_debug_build" = yes; then
-				DEFINES="$DEFINES -DGPH_DEBUG"
-			fi
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s"
 			CXXFLAGS="$CXXFLAGS -mtune=arm926ej-s"
 			ASFLAGS="$ASFLAGS -mfloat-abi=soft"
@@ -2611,9 +2594,14 @@ case $_backend in
 		INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
 		INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
 		;;
-	gp2x)
-		;;
 	gph)
+		# On the GPH devices we want fancy themes but do not want the load/save thumbnail grid.
+		DEFINES="$DEFINES -DDISABLE_SAVELOADCHOOSER_GRID"
+		DEFINES="$DEFINES -DGPH_DEVICE"
+		DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
+		if test "$_debug_build" = yes; then
+			DEFINES="$DEFINES -DGPH_DEBUG"
+		fi
 		;;
 	iphone)
 		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES"
@@ -2709,7 +2697,7 @@ MODULES="$MODULES backends/platform/$_backend"
 # Setup SDL specifics for SDL based backends
 #
 case $_backend in
-	dingux | gp2x | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
+	dingux | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
 		find_sdlconfig
 		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
 		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"