From 4ec20118bb121fdcb10bd8c4487b0fb6016efd17 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 22 Aug 2014 15:00:35 +0200 Subject: [PATCH] Rename bsnes_cplusplus98 dir --- libretro-build-common.sh | 13 +++++++------ libretro-fetch.sh | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 8dc4902d..cbeeaa40 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -336,18 +336,19 @@ build_libretro_ppsspp() { } build_libretro_bsnes_cplusplus98() { + CORENAME="bsnes_cplusplus98" cd "${BASE_DIR}" - if [ -d 'libretro-bsnes-cplusplus98' ]; then - echo '=== Building bSNES C++98 ===' - cd libretro-bsnes-cplusplus98 + if [ -d "libretro-${CORENAME}" ]; then + echo "=== Building ${CORENAME} ===" + cd libretro-${CORENAME} if [ -z "${NOCLEAN}" ]; then - "${MAKE}" clean || die 'Failed to clean bSNES C++98' + "${MAKE}" clean || die "Failed to clean ${CORENAME}" fi "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" - cp "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/bsnes_cplusplus98_libretro${FORMAT}.${FORMAT_EXT}" + cp "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${CORENAME}_libretro${FORMAT}.${FORMAT_EXT}" else - echo 'bSNES C++98 not fetched, skipping ...' + echo "${CORENAME} not fetched, skipping ..." fi } diff --git a/libretro-fetch.sh b/libretro-fetch.sh index 4a00a6b8..19c6640b 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -147,7 +147,7 @@ fetch_project "$REPO_BASE/libretro/mame2003-libretro.git" "libretro-mame078" "li fetch_project "$REPO_BASE/libretro/mame2010-libretro.git" "libretro-mame139" "libretro/mame139" fetch_project "$REPO_BASE/libretro/libretro-mame.git" "libretro-mame" "libretro/mame" fetch_project "$REPO_BASE/libretro/FFmpeg.git" "libretro-ffmpeg" "libretro/FFmpeg" -fetch_project "$REPO_BASE/libretro/bsnes-libretro-cplusplus98.git" "libretro-bsnes-cplusplus98" "libretro/bsnes-cplusplus98" +fetch_project "$REPO_BASE/libretro/bsnes-libretro-cplusplus98.git" "libretro-bsnes_cplusplus98" "libretro/bsnes-cplusplus98" fetch_project "$REPO_BASE/libretro/bsnes-mercury.git" "libretro-bsnes-mercury" "libretro/bsnes-mercury" fetch_project_submodule "$REPO_BASE/libretro/picodrive.git" "libretro-picodrive" "libretro/picodrive" fetch_project "$REPO_BASE/libretro/tgbdual-libretro.git" "libretro-tgbdual" "libretro/tgbdual"