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

CONFIGURE: Move GP2XWIZ and CAANOO to use the GPH backend.

Browse source 
svn-id: r52649
This commit is contained in:
John Willis 2010-09-09 09:55:07 +00:00
parent 9307304d7e
commit 47711e4c59
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -1568,12 +1568,12 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_GFX_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_COSTUME_ASM = 1'
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1' add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="gp2xwiz" _backend="gph"
_build_hq_scalers=no _build_hq_scalers=no
_mt32emu=no _mt32emu=no
_vkeybd=yes _vkeybd=yes
_seq_midi=no _seq_midi=no
_port_mk="backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk" _port_mk="backends/platform/gph/caanoo-bundle.mk"
;; ;;
*darwin*) *darwin*)
_ranlib=$_host-ranlib _ranlib=$_host-ranlib
@ -1670,12 +1670,12 @@ if test -n "$_host"; then
add_line_to_config_mk 'USE_ARM_GFX_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_COSTUME_ASM = 1'
add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1' add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="gp2xwiz" _backend="gph"
_build_hq_scalers=no _build_hq_scalers=no
_mt32emu=no _mt32emu=no
_vkeybd=yes _vkeybd=yes
_seq_midi=no _seq_midi=no
_port_mk="backends/platform/gp2xwiz/gp2xwiz-bundle.mk" _port_mk="backends/platform/gph/gp2xwiz-bundle.mk"
;; ;;
iphone) iphone)
DEFINES="$DEFINES -DIPHONE" DEFINES="$DEFINES -DIPHONE"
@ -1931,7 +1931,7 @@ fi
# Enable 16bit support only for backends which support it # Enable 16bit support only for backends which support it
# #
case $_backend in case $_backend in
caanoo | dreamcast | dingux | gp2xwiz | openpandora | samsungtv | sdl | wii | psp) dreamcast | dingux | gph | openpandora | samsungtv | sdl | wii | psp)
if test "$_16bit" = auto ; then if test "$_16bit" = auto ; then
_16bit=yes _16bit=yes
else else
@ -2600,13 +2600,6 @@ case $_backend in
add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm' add_line_to_config_mk 'PLUGIN_LDFLAGS += -Lbuild.tmp -lscummvm'
add_line_to_config_mk 'PLUGIN_EXTRA_DEPS += build.tmp/libscummvm.so' 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) dc)
INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include' INCLUDES="$INCLUDES "'-I$(srcdir)/backends/platform/dc -isystem $(ronindir)/include'
LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib' LDFLAGS="$LDFLAGS -Wl,-Ttext,0x8c010000 -nostartfiles "'$(ronindir)/lib/crt0.o -L$(ronindir)/lib'
@ -2631,14 +2624,12 @@ case $_backend in
INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
LDFLAGS="$LDFLAGS -static" LDFLAGS="$LDFLAGS -static"
CXXFLAGS="$CXXFLAGS -march=armv4t"
;; ;;
gp2xwiz) gph)
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`"
LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS"
CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s"
;; ;;
iphone) iphone)
OBJCFLAGS="$OBJCFLAGS --std=c99" OBJCFLAGS="$OBJCFLAGS --std=c99"
@ -2665,7 +2656,6 @@ case $_backend in
INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS"
CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon"
;; ;;
ps2) ps2)
# TODO ps2 # TODO ps2