Merge branch 'master' of github.com:libretro/libretro-super

This commit is contained in:
radius 2015-04-11 17:22:21 -04:00
commit 130b39dc42
2 changed files with 10 additions and 4 deletions

View File

@ -1066,6 +1066,13 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
cd ..
cd ..
echo "configuring..."
echo "configure command:
$CONFIGURE"
${CONFIGURE}
echo "cleaning up..."
echo "cleanup command: $MAKE clean"
$MAKE clean
@ -1076,9 +1083,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
echo BUILDBOT JOB: $jobid retroarch cleanup failure!
fi
echo "configuring..."
echo "configure command: $CONFIGURE"
${CONFIGURE}
if [ $? -eq 0 ]; then
echo BUILDBOT JOB: $jobid retroarch configure success!
@ -1086,7 +1091,6 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" =
echo BUILDBOT JOB: $jobid retroarch configure failure!
fi
echo "building..."
echo "build command: $MAKE -j${JOBS}"
$MAKE -j${JOBS}

View File

@ -66,3 +66,5 @@ vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GEN
vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro .
virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile .
yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro
ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git SUBMODULE YES GENERIC_GL Makefile libretro
ffmpeg libretro-ffmpeg https://github.com/libretro/FFmpeg.git PROJECT YES GENERIC_GL Makefile libretro