diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh index be59745e..745442ac 100755 --- a/libretro-build-android-mk.sh +++ b/libretro-build-android-mk.sh @@ -46,7 +46,7 @@ build_libretro_mednafen() echo "=== Building Mednafen cores ===" cd libretro-mednafen cd jni - for core in pce_fast pcfx lynx wswan ngp; do + for core in pce_fast pcfx lynx wswan; do echo "=== Building Mednafen ${core} ===" if [ -z "${NOCLEAN}" ]; then ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean mednafen_${core}" @@ -62,6 +62,26 @@ build_libretro_mednafen() fi } +build_libretro_mednafen_ngp() +{ + cd $BASE_DIR + pwd + if [ -d "libretro-mednafen-ngp" ]; then + cd libretro-mednafen-ngp + cd jni + echo "=== Building Mednafen NGP ===" + if [ -z "${NOCLEAN}" ]; then + ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen NGP" + fi + ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen NGP" + cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT} + cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT} + cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT} + else + echo "Mednafen NGP not fetched, skipping ..." + fi +} + build_libretro_mednafen_psx() { cd $BASE_DIR @@ -680,6 +700,7 @@ else #build_libretro_bsnes_cplusplus98 build_libretro_bsnes build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_mednafen_psx diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh index 80ccbc80..a9d3ea24 100644 --- a/libretro-build-common-xdk.sh +++ b/libretro-build-common-xdk.sh @@ -8,7 +8,7 @@ die() build_libretro_mednafen() { - for core in pcfx wswan ngp gba; do + for core in pcfx wswan gba; do cd $BASE_DIR if [ -d "libretro-mednafen" ]; then echo "=== Building Mednafen ${core} ===" @@ -22,6 +22,20 @@ build_libretro_mednafen() done } +build_libretro_mednafen_ngp() +{ + cd $BASE_DIR + if [ -d "libretro-mednafen-ngp" ]; then + echo "=== Building Mednafen NGP ===" + cd libretro-mednafen-ngp + cd msvc + cmd.exe /k $MSVC_NAME.bat + cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_ngp_libretro$FORMAT.$FORMAT_EXT + else + echo "Mednafen NGP not fetched, skipping ..." + fi +} + build_libretro_mednafen_pce_fast() { cd $BASE_DIR diff --git a/libretro-build-common.sh b/libretro-build-common.sh index f67b25bb..d9d28397 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -180,7 +180,7 @@ build_libretro_mednafen() { echo '=== Building Mednafen ===' cd libretro-mednafen - for core in pcfx lynx wswan ngp gba; do + for core in pcfx lynx wswan gba; do if [ -z "${NOCLEAN}" ]; then "${MAKE}" core="${core}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/${core}" fi @@ -192,6 +192,20 @@ build_libretro_mednafen() { fi } +build_libretro_mednafen_ngp() { + cd "${BASE_DIR}" + if [ -d 'libretro-mednafen-ngp' ]; then + echo '=== Building Mednafen NGP ===' + cd libretro-mednafen-ngp + + "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/ngp" + "${MAKE}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" || die "Failed to build mednafen/ngp" + cp "mednafen_ngp_libretro${FORMAT}.${FORMAT_EXT}" "${RARCH_DIST_DIR}" + else + echo 'Mednafen NGP not fetched, skipping ...' + fi +} + build_libretro_mednafen_pce_fast() { cd "${BASE_DIR}" if [ -d 'libretro-mednafen-pce-fast' ]; then diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh index fae0825b..95233d56 100755 --- a/libretro-build-ios.sh +++ b/libretro-build-ios.sh @@ -30,6 +30,7 @@ else build_libretro_bsnes_cplusplus98 build_libretro_bsnes build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_mednafen_psx diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh index 592274f0..6d601aa9 100755 --- a/libretro-build-ngc.sh +++ b/libretro-build-ngc.sh @@ -18,6 +18,7 @@ if [ $1 ]; then $1 else build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_s9x_next diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh index f40ea9aa..cf9a57e2 100755 --- a/libretro-build-ps3.sh +++ b/libretro-build-ps3.sh @@ -17,6 +17,7 @@ if [ $1 ]; then $1 else build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_mednafen_psx diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh index eb56f13e..81fcb48b 100755 --- a/libretro-build-psp1.sh +++ b/libretro-build-psp1.sh @@ -16,6 +16,7 @@ MAKE=make if [ $1 ]; then $1 else + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_mednafen diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh index 3a02762f..e767849b 100755 --- a/libretro-build-wii.sh +++ b/libretro-build-wii.sh @@ -18,6 +18,8 @@ if [ $1 ]; then $1 else build_libretro_mednafen + build_libretro_mednafen_ngp + build_libretro_mednafen_pce_fast build_libretro_mednafen_psx build_libretro_mednafen_vb build_libretro_s9x_next diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh index b61f1346..1a540c73 100644 --- a/libretro-build-xdk1.sh +++ b/libretro-build-xdk1.sh @@ -80,6 +80,7 @@ if [ $1 ]; then $1 else build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_s9x_next diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh index 9079ab57..92c11f0d 100644 --- a/libretro-build-xdk360.sh +++ b/libretro-build-xdk360.sh @@ -36,6 +36,7 @@ if [ $1 ]; then $1 else build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_s9x_next diff --git a/libretro-build.sh b/libretro-build.sh index 036f4d91..199b6423 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -97,6 +97,7 @@ else build_libretro_bsnes_cplusplus98 build_libretro_bsnes build_libretro_mednafen + build_libretro_mednafen_ngp build_libretro_mednafen_pce_fast build_libretro_mednafen_vb build_libretro_mednafen_psx diff --git a/libretro-fetch.sh b/libretro-fetch.sh index babd3464..7f275861 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -95,6 +95,7 @@ fetch_project "$REPO_BASE/libretro/nestopia.git" "libretro-nestopia" "libretro/N fetch_project "$REPO_BASE/libretro/tyrquake.git" "libretro-tyrquake" "libretro/tyrquake" fetch_project "$REPO_BASE/libretro/pcsx_rearmed.git" "libretro-pcsx-rearmed" "libretro/pcsx_rearmed" fetch_project "$REPO_BASE/libretro/mednafen-libretro.git" "libretro-mednafen" "libretro/Mednafen" +fetch_project "$REPO_BASE/libretro/mednafen-ngp-libretro.git" "libretro-mednafen-ngp" "libretro/Mednafen NGP" fetch_project "$REPO_BASE/libretro/mednafen-pce-fast-libretro.git" "libretro-mednafen-pce-fast" "libretro/Mednafen PCE Fast" fetch_project "$REPO_BASE/libretro/mednafen-psx-libretro.git" "libretro-mednafen-psx" "libretro/Mednafen PSX" fetch_project "$REPO_BASE/libretro/mednafen-vb-libretro.git" "libretro-mednafen-vb" "libretro/Mednafen VB"