From e42c31666c2aefad3d5940ca002c6b4118094e3a Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Thu, 12 Mar 2015 07:57:03 -0700
Subject: [PATCH] Mupen64plus is now supported by modern rules

---
 libretro-build-common.sh | 36 ------------------------------------
 rules.d/core-rules.sh    | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index dee65b4e..6da86999 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -430,42 +430,6 @@ create_dist_dir
 ########## LEGACY RULES
 # TODO: Port these to modern rules
 
-build_libretro_mupen64() {
-	if check_opengl; then
-		build_dir="$WORKDIR/libretro-mupen64plus"
-
-		if build_should_skip mupen64plus "$build_dir"; then
-			echo "Core mupen64plus is already built, skipping..."
-			return
-		fi
-
-		if [ -d "$build_dir" ]; then
-			echo_cmd "cd \"$build_dir\""
-
-			if iscpu_x86_64 $ARCH; then
-				dynarec="WITH_DYNAREC=x86_64"
-			elif iscpu_x86 $ARCH; then
-				dynarec="WITH_DYNAREC=x86"
-			elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "$platform" = "ios" ]; then
-				dynarec="WITH_DYNAREC=arm"
-			fi
-
-			echo '=== Building Mupen 64 Plus ==='
-			if [ -z "$NOCLEAN" ]; then
-				echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64'
-			fi
-
-			echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" $COMPILER \"-j$JOBS\"" || die 'Failed to build Mupen 64'
-
-			copy_core_to_dist "mupen64plus"
-			build_save_revision $? "mupen64plus"
-		else
-			echo 'Mupen64 Plus not fetched, skipping ...'
-		fi
-		reset_compiler_targets
-	fi
-}
-
 build_libretro_mame_prerule() {
 	build_dir="$WORKDIR/libretro-mame"
 
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index dca92e14..ef63ee33 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -222,8 +222,18 @@ libretro_tgbdual_git_url="https://github.com/libretro/tgbdual-libretro.git"
 register_core "mupen64plus" -theos_ios -ngc -ps3 -psp1 -wii
 libretro_mupen64plus_name="Mupen64Plus"
 libretro_mupen64plus_git_url="https://github.com/libretro/mupen64plus-libretro.git"
-libretro_mupen64plus_build_rule=legacy
-libretro_mupen64plus_build_legacy=build_libretro_mupen64
+#libretro_mupen64plus_build_rule=legacy
+#libretro_mupen64plus_build_legacy=build_libretro_mupen64
+libretro_mupen64plus_build_platform="$FORMAT_COMPILER_TARGET_ALT"
+libretro_mupen64Plus_build_configure() {
+	if iscpu_x86_64 $ARCH; then
+		core_build_args="WITH_DYNAREC=x86_64"
+	elif iscpu_x86 $ARCH; then
+		core_build_args="WITH_DYNAREC=x86"
+	elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "$platform" = "ios" ]; then
+		core_build_args="WITH_DYNAREC=arm"
+	fi
+}
 
 register_core "dinothawr" -theos_ios -ngc -ps3 -psp1 -qnx -wii
 libretro_dinothawr_name="Dinothawr"