From a6bfb4ea3f0c3203eb19f5d5bd4d9cb2e6fea004 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 19 Oct 2013 20:22:44 +0200
Subject: [PATCH] (Android) Can now compile Mupen64 with
 libretro-build-android-mk.sh

---
 libretro-build-android-mk.sh | 16 ++++++++++++++++
 libretro-build.sh            |  2 --
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 1f5b38bd..d0ba722b 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -484,6 +484,21 @@ build_libretro_bsnes_performance()
    fi
 }
 
+build_libretro_mupen64()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-mupen64plus" ]; then
+      echo '=== Building Mupen 64 Plus (ARMv7 dynarec) ==='
+      cd libretro-mupen64plus
+      cd libretro/jni
+      ndk-build clean APP_ABI="armeabi-v7a"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a"
+      cp ../libs/armeabi-v7a/libretro_mupen64plus.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_mupen64plus.${FORMAT_EXT}
+   else
+      echo 'Mupen64 Plus not fetched, skipping ...'
+   fi
+}
+
 create_dist_dir
 
 if [ $1 ]; then
@@ -510,5 +525,6 @@ else
    build_libretro_scenewalker
    build_libretro_picodrive
    build_libretro_bsnes_performance
+   build_libretro_mupen64
    build_libretro_dinothawr
 fi
diff --git a/libretro-build.sh b/libretro-build.sh
index fe80819a..7129c7ad 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -119,9 +119,7 @@ fi
    build_libretro_modelviewer
    build_libretro_scenewalker
    build_libretro_instancingviewer
-if [ -z $BUILD_EXPERIMENTAL ]; then
    build_libretro_mupen64
-fi
    build_libretro_ffmpeg
    build_libretro_dinothawr
 fi