diff options
| -rwxr-xr-x | configure | 22 |
1 files changed, 6 insertions, 16 deletions
@@ -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_COSTUME_ASM = 1' add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1' - _backend="gp2xwiz" + _backend="gph" _build_hq_scalers=no _mt32emu=no _vkeybd=yes _seq_midi=no - _port_mk="backends/platform/gp2xwiz/caanoo/caanoo-bundle.mk" + _port_mk="backends/platform/gph/caanoo-bundle.mk" ;; *darwin*) _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_COSTUME_ASM = 1' add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1' - _backend="gp2xwiz" + _backend="gph" _build_hq_scalers=no _mt32emu=no _vkeybd=yes _seq_midi=no - _port_mk="backends/platform/gp2xwiz/gp2xwiz-bundle.mk" + _port_mk="backends/platform/gph/gp2xwiz-bundle.mk" ;; iphone) DEFINES="$DEFINES -DIPHONE" @@ -1931,7 +1931,7 @@ fi # Enable 16bit support only for backends which support it # 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 _16bit=yes else @@ -2600,13 +2600,6 @@ 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' @@ -2631,14 +2624,12 @@ case $_backend in INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LDFLAGS="$LDFLAGS -static" - CXXFLAGS="$CXXFLAGS -march=armv4t" ;; - gp2xwiz) + gph) find_sdlconfig INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LDFLAGS="$LDFLAGS" - CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s -mtune=arm926ej-s" ;; iphone) OBJCFLAGS="$OBJCFLAGS --std=c99" @@ -2665,7 +2656,6 @@ case $_backend in INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" LDFLAGS="$LDFLAGS" - CXXFLAGS="$CXXFLAGS -march=armv7-a -mtune=cortex-a8 -mfpu=neon" ;; ps2) # TODO ps2 |