libretro-buildbot-recipe.sh: Use $NAME instead of the HIGAN command.

This commit is contained in:
orbea 2017-12-24 17:41:55 -08:00
parent bcaf9efe1d
commit 7db96992bc
5 changed files with 16 additions and 14 deletions

View file

@ -287,7 +287,6 @@ build_libretro_generic_makefile() {
MAKEFILE=$4
PLATFORM=$5
ARGS=$6
OUT=.
ENTRY_ID=""
@ -308,10 +307,13 @@ build_libretro_generic_makefile() {
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-opengl"
export FORMAT_COMPILER_TARGET_ALT="${FORMAT_COMPILER_TARGET}"
fi
elif [ "${COMMAND}" = "HIGAN" ] || [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ] || [ "${NAME}" = "bsnes_cplusplus98" ]; then
OUT="out"
fi
case "{$NAME}" in
*higan_sfc*|*bsnes* ) OUT="out" ;;
* ) OUT=. ;;
esac
cd "${SUBDIR}"
if [ "${NAME}" = "bsnes" ] || [ "${NAME}" = "bsnes_mercury" ]; then
@ -339,7 +341,7 @@ build_libretro_generic_makefile() {
echo -------------------------------------------------- 2>&1 | tee -a "$LOGFILE"
if [ -z "${NOCLEAN}" ] && [ -f "${MAKEFILE}" ] && [ "${COMMAND}" != "CMAKE" ]; then
if [ "${COMMAND}" = "HIGAN" ]; then
if [ "${NAME}" = "higan_sfc" ] || [ "${NAME}" = "higan_sfc_balanced" ]; then
rm -fv obj/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE"
rm -fv out/*.{o,"${FORMAT_EXT}"} 2>&1 | tee -a "$LOGFILE"
else
@ -368,7 +370,7 @@ build_libretro_generic_makefile() {
${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} 2>&1 | tee -a "$LOGFILE"
find . -mindepth 2 -name "${core}_libretro${FORMAT}${LIBSUFFIX}.${FORMAT_EXT}" -exec cp -f "{}" . \;
elif [ "${COMMAND}" = "HIGAN" ]; then
elif [ "${NAME}" = "higan_sfc" ] || [ "${NAME}" = "higan_sfc_balanced" ]; then
platform=""
echo "BUILD CMD: ${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS}" ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE"
${HELPER} ${MAKE} -f ${MAKEFILE} -j${JOBS} ${CORE_ARGS} 2>&1 | tee -a "$LOGFILE"
@ -651,7 +653,7 @@ while read line; do
CORES_BUILT=YES
echo "buildbot job: building $NAME"
case "${COMMAND}" in
CMAKE|GENERIC|GENERIC_GL|HIGAN )
CMAKE|GENERIC|GENERIC_GL )
build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}" ;;
GENERIC_JNI ) build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;;
GENERIC_ALT ) build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}" ;;

View file

@ -29,8 +29,8 @@ gme libretro-gme https://github.com/libretro/libretro-gme.git master YES GENERIC
gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makefile .
handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=clang++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=clang++ target=libretro binary=library
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=clang++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=clang++ target=libretro binary=library
lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro .
mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .

View file

@ -35,8 +35,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . PTR64=1
mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .

View file

@ -34,8 +34,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . PTR64=1
mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .

View file

@ -33,8 +33,8 @@ gpsp libretro-gpsp https://github.com/libretro/gpsp.git master YES GENERIC Makef
gw libretro-gw https://github.com/libretro/gw-libretro.git master YES GENERIC Makefile .
handy libretro-handy https://github.com/libretro/libretro-handy.git master YES GENERIC Makefile .
hatari libretro-hatari https://github.com/libretro/hatari.git master YES GENERIC Makefile.libretro .
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES HIGAN GNUmakefile higan compiler=g++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES HIGAN GNUmakefile nSide compiler=g++ target=libretro binary=library
higan_sfc libretro-higan https://gitlab.com/higan/higan.git libretro YES GENERIC GNUmakefile higan compiler=g++ target=libretro binary=library
higan_sfc_balanced libretro-nside https://github.com/hex-usr/nSide.git master YES GENERIC GNUmakefile nSide compiler=g++ target=libretro binary=library
lutro libretro-lutro https://github.com/libretro/libretro-lutro master YES GENERIC Makefile .
mame libretro-mame https://github.com/libretro/mame.git master YES GENERIC Makefile.libretro . PTR64=0
mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git master YES GENERIC Makefile .