Merge pull request #147 from fr500/master

Add a few more cores to the buildbot
This commit is contained in:
Twinaphex 2014-12-06 21:08:12 +01:00
commit fac369ee16
2 changed files with 16 additions and 8 deletions

View File

@ -5,7 +5,7 @@
# if you want to force all enabled cores to rebuild prepend FORCE=YES
# you may need to specify your make command by prepending it to the commandline, for instance MAKE=mingw32-make
#
# eg: FORCE=YES MAKE=mingw32-make ./libretro-fetch-and-build.sh buildbot.conf
# eg: FORCE=YES MAKE=mingw32-make ./libretro-fetch-and-build.sh buildbot
####environment configuration:
echo "Setting up Environment for $1"
@ -21,7 +21,7 @@ while read line; do
if [ "${KEY}" == "PATH" ];
then
export PATH=${ORIGPATH}:${VALUE}
export PATH=${VALUE}:${ORIGPATH}
echo New PATH: $PATH
else
@ -30,6 +30,8 @@ while read line; do
fi
done < $1.conf
echo
echo
. ./libretro-config.sh
@ -41,10 +43,6 @@ echo
[[ "${ARM_SOFTFLOAT}" ]] && echo 'ARM softfloat ABI enabled...' && export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}-softfloat"
[[ "${IOS}" ]] && echo 'iOS detected...'
echo "${FORMAT_COMPILER_TARGET}"
echo "${FORMAT_COMPILER_TARGET_ALT}"
# BSDs don't have readlink -f
read_link()
{
@ -116,10 +114,17 @@ if [ -z "$CXX" ]; then
fi
fi
if [ "${CC}" ] && [ "${CXX}" ]; then
COMPILER="CC=\"${CC}\" CXX=\"${CXX}\""
else
COMPILER=""
fi
echo
echo "CC = $CC"
echo "CXX = $CXX"
echo "STRIP = $STRIP"
echo "COMPILER = $COMPILER"
echo
RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
@ -296,7 +301,8 @@ build_libretro_bsnes() {
${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
elif [ "${PROFILE}" == "bnes" ];
then
${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}
echo "buid command: ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
else
echo "buid command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}"
${MAKE} -f ${MAKEFILE} platform=${PLATFORM} compiler=${BSNESCOMPILER} ui='target-libretro' profile=${PROFILE} -j${JOBS}

View File

@ -23,6 +23,7 @@ fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GEN
gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_ALT Makefile.libretro libgambatte
genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro .
handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC Makefile .
hatari libretro-hatari https://github.com/libretro/libretro-hatari.git PROJECT YES GENERIC Makefile.libretro .
mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile .
mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile .
mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile .
@ -42,6 +43,7 @@ o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GEN
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC Makefile.libretro . USE_DYNAREC=0
picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC Makefile.libretro .
prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC Makefile .
puae libretro-uae https://github.com/libretro/libretro-uae.git PROJECT YES GENERIC Makefile build
quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git PROJECT YES GENERIC Makefile libretro
remotejoy libretro-remotejoy https://github.com/libretro/libretro-remotejoy.git PROJECT YES GENERIC Makefile .
scummvm libretro-scummvm https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build