thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: Set DISABLE_SAVELOADCHOOSER_GRID for the GPH backend.

Browse source 
* Move some backend settings from the host selection to the backend.
* Also remove stale referances to the old GP2X backend.
This commit is contained in:
David-John Willis 2012-08-16 10:54:39 +01:00
parent 037cdaefac
commit e7ae58f2e4
1 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
configure vendored
View file

@ -712,7 +712,7 @@ Usage: $0 [OPTIONS]...
Configuration: Configuration:
-h, --help display this help and exit -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, iphone, linuxmoto, maemo, n64, null, openpandora, ps2,
psp, samsungtv, sdl, webos, wii, wince) [sdl] psp, samsungtv, sdl, webos, wii, wince) [sdl]
@ -2202,13 +2202,8 @@ if test -n "$_host"; then
bfin*) bfin*)
;; ;;
caanoo) caanoo)
# This uses the GPH backend.
DEFINES="$DEFINES -DGPH_DEVICE"
DEFINES="$DEFINES -DCAANOO" DEFINES="$DEFINES -DCAANOO"
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE" if test "$_debug_build" = no; then
if test "$_debug_build" = yes; then
DEFINES="$DEFINES -DGPH_DEBUG"
else
# Use -O3 on the Caanoo for non-debug builds. # Use -O3 on the Caanoo for non-debug builds.
_optimization_level=-O3 _optimization_level=-O3
fi fi
@ -2299,13 +2294,7 @@ if test -n "$_host"; then
add_line_to_config_h "#define USE_WII_DI" add_line_to_config_h "#define USE_WII_DI"
;; ;;
gp2x) gp2x)
# This uses the GPH backend.
DEFINES="$DEFINES -DGPH_DEVICE"
DEFINES="$DEFINES -DGP2X" DEFINES="$DEFINES -DGP2X"
DEFINES="$DEFINES -DREDUCE_MEMORY_USAGE"
if test "$_debug_build" = yes; then
DEFINES="$DEFINES -DGPH_DEBUG"
fi
CXXFLAGS="$CXXFLAGS -march=armv4t" CXXFLAGS="$CXXFLAGS -march=armv4t"
ASFLAGS="$ASFLAGS -mfloat-abi=soft" ASFLAGS="$ASFLAGS -mfloat-abi=soft"
LDFLAGS="$LDFLAGS -static" LDFLAGS="$LDFLAGS -static"
@ -2319,13 +2308,7 @@ if test -n "$_host"; then
_port_mk="backends/platform/gph/gp2x-bundle.mk" _port_mk="backends/platform/gph/gp2x-bundle.mk"
;; ;;
gp2xwiz) gp2xwiz)
# This uses the GPH backend.
DEFINES="$DEFINES -DGPH_DEVICE"
DEFINES="$DEFINES -DGP2XWIZ" 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 -mcpu=arm926ej-s"
CXXFLAGS="$CXXFLAGS -mtune=arm926ej-s" CXXFLAGS="$CXXFLAGS -mtune=arm926ej-s"
ASFLAGS="$ASFLAGS -mfloat-abi=soft" ASFLAGS="$ASFLAGS -mfloat-abi=soft"
@ -2611,9 +2594,14 @@ case $_backend in
INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude' INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/ds/commoninclude'
INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data' INCLUDES="$INCLUDES "'-Ibackends/platform/ds/arm9/data'
;; ;;
gp2x)
;;
gph) 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) iphone)
LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES" 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 # Setup SDL specifics for SDL based backends
# #
case $_backend in case $_backend in
dingux | gp2x | gph | linuxmoto | maemo | openpandora | samsungtv | sdl) dingux | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
find_sdlconfig find_sdlconfig
INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"