From c59c60a9921de3033d41d5884a12c7d5db47f919 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 16 Dec 2013 02:15:02 +0100
Subject: [PATCH] libretro-build-android-mk.sh - reorder and add Handy
 compilation

---
 libretro-build-android-mk.sh | 43 +++++++++++++++++++++++++++++++-----
 libretro-build-ios.sh        |  5 +++++
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 7f55ba9d..d75f4418 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -39,6 +39,7 @@ die()
 
 build_libretro_mednafen()
 {
+   #TODO - refactor
    cd $BASE_DIR
    pwd
    if [ -d "libretro-mednafen" ]; then
@@ -434,6 +435,23 @@ build_libretro_picodrive()
    fi
 }
 
+build_libretro_handy()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-handy" ]; then
+      echo "=== Building Handy ==="
+      cd libretro-handy
+      cd libretro/jni
+      ndk-build clean APP_ABI="armeabi-v7a mips x86"
+      ndk-build -j$JOBS APP_ABI="armeabi-v7a mips x86"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/armeabi-v7a/handy_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/mips/handy_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"/x86/handy_libretro${FORMAT}.${FORMAT_EXT}
+   else
+      echo "Handy not fetched, skipping ..."
+   fi
+}
+
 build_libretro_desmume()
 {
    cd $BASE_DIR
@@ -503,8 +521,9 @@ create_dist_dir()
    fi
 }
 
-build_libretro_bsnes_performance()
+build_libretro_bsnes()
 {
+   #TODO - maybe accuracy/balanced cores as well
    cd $BASE_DIR
    if [ -d "libretro-bsnes" ]; then
       echo "=== Building bsnes (performance core) ==="
@@ -539,29 +558,41 @@ create_dist_dir
 if [ $1 ]; then
    $1
 else
-   build_libretro_pcsx_rearmed
+   #build_libretro_bsnes_cplusplus98
+   build_libretro_bsnes
    build_libretro_mednafen
+   #build_libretro_mednafen_gba
+   #build_libretro_mednafen_snes
+   #build_libretro_mednafen_psx
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba_full
    build_libretro_vbam
    build_libretro_vba_next
+   #build_libretro_bnes
    build_libretro_fceu
    build_libretro_gambatte
+   build_libretro_meteor
    build_libretro_nx
    build_libretro_prboom
    build_libretro_stella
    build_libretro_quicknes
-   build_libretro_desmume
    build_libretro_nestopia
    build_libretro_tyrquake
+   #build_libretro_mame078
+   #build_libretro_mame
+   #build_libretro_dosbox
+   #build_libretro_scummvm
+   build_libretro_picodrive
+   build_libretro_handy
+   build_libretro_desmume
+   build_libretro_pcsx_rearmed
    build_libretro_modelviewer
+   build_libretro_scenewalker
    build_libretro_instancingviewer
    build_libretro_instancingviewer_camera
-   build_libretro_scenewalker
-   build_libretro_picodrive
-   build_libretro_bsnes_performance
    build_libretro_mupen64
+   #build_libretro_ffmpeg
    build_libretro_dinothawr
 fi
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 13460693..4378212c 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -25,6 +25,7 @@ else
    build_libretro_bsnes
    build_libretro_mednafen
    build_libretro_mednafen_gba
+   #build_libretro_mednafen_snes
    build_libretro_mednafen_psx
    build_libretro_s9x
    build_libretro_s9x_next
@@ -34,6 +35,7 @@ else
    build_libretro_vba_next
    build_libretro_fceu
    build_libretro_gambatte
+   #build_libretro_meteor
    build_libretro_nx
    build_libretro_prboom
    build_libretro_stella
@@ -41,6 +43,8 @@ else
    build_libretro_nestopia
    build_libretro_tyrquake
    build_libretro_mame078
+   #build_libretro_mame
+   #build_libretro_dosbox
    build_libretro_scummvm
    build_libretro_picodrive
    build_libretro_handy
@@ -51,5 +55,6 @@ else
    build_libretro_instancingviewer
    build_libretro_instancingviewer_camera
    build_libretro_mupen64
+   #build_libretro_ffmpeg
    build_libretro_dinothawr
 fi