diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 6b107c0d..91ba037c 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -220,14 +220,18 @@ build_libretro_generic_makefile() { echo BUILDBOT THREADS: $JOBS - if [ "${NAME}" = "mame078" ]; then + if [ "${NAME}" == "mame078" ]; then JOBS=1 fi + if [ "${NAME}" == "mame2010" ]; then + JOBS=1 + NOCLEAN=1 + fi if [ -z "${NOCLEAN}" ]; then echo "cleaning up..." - echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean" - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} clean + echo "cleanup command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean" + ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} clean if [ $? -eq 0 ]; then echo BUILDBOT JOB: $jobid $1 cleanup success! else @@ -240,11 +244,11 @@ build_libretro_generic_makefile() { echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}" ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log else - if [ "${NAME}" = "mame2010" ]; then - - echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools - ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools + if [ "${NAME}" == "mame2010" ]; then + echo "build command: ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS}" + ${MAKE} -f ${MAKEFILE} "VRENDER=soft" "NATIVE=1" buildtools -j${JOBS} &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log fi + echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} &>> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PLATFORM}.log fi @@ -805,6 +809,12 @@ while read line; do BUILD="YES" fi + if [ "${PREVCORE}" = "mame2010" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "mame2010" ]; then + FORCE="YES" + BUILD="YES" + fi + + cd $WORK else echo "cloning repo..." diff --git a/recipes/android/cores-ndk-standalone-mame-armv7 b/recipes/android/cores-ndk-standalone-mame-armv7 index c25d13bf..9e047436 100644 --- a/recipes/android/cores-ndk-standalone-mame-armv7 +++ b/recipes/android/cores-ndk-standalone-mame-armv7 @@ -1,6 +1,5 @@ mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC makefile . OSD="retro" RETRO=1 NOWERROR=1 NOASM=1 gcc="android-arm" TARGETOS="android-arm" CONFIG=libretro USE_BGFX=0 NO_USE_MIDI="1" -mame078 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC Makefile . -mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile.libretro . VRENDER=soft +mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile.libretro . VRENDER=soft emulator mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=mame PARTIAL=1 mess2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=mess PARTIAL=1 ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile.libretro . TARGET=ume PARTIAL=1