Make mame iOS build fail gracefully in the mame_modern function as well

This commit is contained in:
T. Joseph Carter 2015-03-02 16:32:43 -08:00
parent 0e4520e891
commit 94cd2a586d

View File

@ -358,15 +358,21 @@ build_libretro_mame_modern() {
if [ -z "$NOCLEAN" ]; then if [ -z "$NOCLEAN" ]; then
echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$2\" \"PARTIAL=$3\" platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$2\" \"PARTIAL=$3\" platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME'
fi fi
echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$2\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"NATIVE=1\" buildtools \"-j$JOBS\"" || die 'Failed to build MAME buildtools' echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$2\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"NATIVE=1\" buildtools \"-j$JOBS\""
echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$2\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\"" || die 'Failed to build MAME (iOS)' ret=$?
if [ "$ret" = 0 ]; then
echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$2\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\""
ret=$?
fi
else else
[ "$X86_64" = "true" ] && PTR64=1 [ "$X86_64" = "true" ] && PTR64=1
if [ -z "$NOCLEAN" ]; then if [ -z "$NOCLEAN" ]; then
echo_cmd "$MAKE -f Makefile.libretro PTR64=\"$PTR64\" \"TARGET=$2\" \"PARTIAL=$3\" platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' echo_cmd "$MAKE -f Makefile.libretro PTR64=\"$PTR64\" \"TARGET=$2\" \"PARTIAL=$3\" platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME'
fi fi
echo_cmd "$MAKE -f Makefile.libretro PTR64=\"$PTR64\" \"TARGET=$2\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\"" || die 'Failed to build MAME' echo_cmd "$MAKE -f Makefile.libretro PTR64=\"$PTR64\" \"TARGET=$2\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\""
ret=$?
fi fi
[ "$ret" -gt 0 ] && die 'Failed to build MAME'
echo_cmd "cp \"$2$CORE_SUFFIX\" \"$RARCH_DIST_DIR\"" echo_cmd "cp \"$2$CORE_SUFFIX\" \"$RARCH_DIST_DIR\""
ret=$? ret=$?
@ -406,6 +412,7 @@ build_libretro_mame_prerule() {
echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\"" echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\""
ret=$? ret=$?
fi fi
[ "$ret" -gt 0 ] && die 'Failed to build MAME'
build_summary_log $ret "$target" build_summary_log $ret "$target"
else else
for target in mame mess ume; do for target in mame mess ume; do