Fix libretro-build-common.sh so everything installs again

This commit is contained in:
T. Joseph Carter 2015-02-15 11:18:39 -08:00
parent 9f46622c44
commit d1ad20f1cd

View File

@ -128,8 +128,6 @@ copy_core_to_dist() {
} }
build_libretro_generic() { build_libretro_generic() {
if [ -d "${5}" ]; then
echo "=== Building ${1} ==="
cd "${5}/${2}" cd "${5}/${2}"
if [ -z "${NOCLEAN}" ]; then if [ -z "${NOCLEAN}" ]; then
@ -137,12 +135,6 @@ build_libretro_generic() {
fi fi
echo "${MAKE}" -f ${3} platform="${4}" CC="$CC" CXX="$CXX" "-j${JOBS}" echo "${MAKE}" -f ${3} platform="${4}" CC="$CC" CXX="$CXX" "-j${JOBS}"
"${MAKE}" -f ${3} platform="${4}" CC="$CC" CXX="$CXX" "-j${JOBS}" || die "Failed to build ${1}" "${MAKE}" -f ${3} platform="${4}" CC="$CC" CXX="$CXX" "-j${JOBS}" || die "Failed to build ${1}"
if [ -z "${5}" ]; then
copy_core_to_dist $1
fi
else
echo "${1} not fetched, skipping ..."
fi
} }
# $1 is corename # $1 is corename
@ -151,13 +143,24 @@ build_libretro_generic() {
# $4 is preferred platform # $4 is preferred platform
build_libretro_generic_makefile() { build_libretro_generic_makefile() {
build_dir="${WORKDIR}/libretro-${1}" build_dir="${WORKDIR}/libretro-${1}"
if [ -d "$build_dir" ]; then
echo "=== Building ${1} ==="
build_libretro_generic $1 $2 $3 $4 $build_dir build_libretro_generic $1 $2 $3 $4 $build_dir
copy_core_to_dist $1
else
echo "${1} not fetched, skipping ..."
fi
} }
build_retroarch_generic_makefile() { build_retroarch_generic_makefile() {
build_dir="${WORKDIR}/${1}" build_dir="${WORKDIR}/${1}"
if [ -d "$build_dir" ]; then
echo "=== Building ${2} ==="
build_libretro_generic $1 $2 $3 $4 $build_dir build_libretro_generic $1 $2 $3 $4 $build_dir
copy_core_to_dist $5 copy_core_to_dist $5
else
echo "${1} not fetched, skipping ..."
fi
} }
build_libretro_stonesoup() { build_libretro_stonesoup() {