From f60e902d7cb6ebbf8a634287e6f45b4f4dfbbae9 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Fri, 13 Mar 2015 11:56:06 -0700
Subject: [PATCH] MAME is now the _only_ legacy rule.  If fixed for iOS, magic
 happens.

---
 libretro-build-common.sh | 28 ----------------------------
 rules.d/core-rules.sh    | 10 ++++++----
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index a293ac83..cb85fcb1 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -478,31 +478,3 @@ build_libretro_mame_prerule() {
 
 	build_save_revision $ret mame
 }
-
-build_libretro_pcsx_rearmed() {
-	build_dir="$WORKDIR/libretro-pcsx_rearmed"
-
-	if build_should_skip "pcsx_rearmed" "$build_dir"; then
-		echo "Core pcsx_rearmed is already built, skipping..."
-		return
-	fi
-
-	if [ -d "$build_dir" ]; then
-		echo '=== Building PCSX ReARMed ==='
-		echo_cmd "cd \"$build_dir\""
-
-		if [ -z "$NOCLEAN" ]; then
-			echo_cmd "$MAKE -f Makefile.libretro platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean PCSX ReARMed'
-		fi
-		echo_cmd "$MAKE -f Makefile.libretro platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\"" || die 'Failed to build PCSX ReARMed'
-		copy_core_to_dist "pcsx_rearmed"
-		ret=$?
-		if [ "$platform" = "ios" ]; then
-			copy_core_to_dist "pcsx_rearmed_interpreter"
-			ret=$?
-		fi
-		build_save_revision $ret "pcsx_rearmed"
-	else
-		echo 'PCSX ReARMed not fetched, skipping ...'
-	fi
-}
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index c3a8988a..55094ec3 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -110,10 +110,12 @@ libretro_tyrquake_build_makefile="Makefile"
 register_core "pcsx_rearmed" -theos_ios -ngc -ps3 -psp1 -wii
 libretro_pcsx_rearmed_name="PCSX ReARMed"
 libretro_pcsx_rearmed_git_url="https://github.com/libretro/pcsx_rearmed.git"
-# FIXME: Disabling modern rule so we can build dynarrec and interpreter on iOS
-#libretro_pcsx_rearmed_build_makefile="Makefile.libretro"
-libretro_pcsx_rearmed_build_rule=legacy
-libretro_pcsx_rearmed_build_legacy=build_libretro_pcsx_rearmed
+libretro_pcsx_rearmed_build_makefile="Makefile.libretro"
+libretro_pcsx_rearmed_build_configure() {
+	if [ "$platform" = "ios" ]; then
+		core_build_cores="pcsx_rearmed_interpreter pcsx_rearmed"
+	fi
+}
 
 register_core "mednafen_gba" -theos_ios
 libretro_mednafen_gba_name="Mednafen/Beetle GBA"