From f50e4ae1606b2ca7d39ecccc66393c7010cd9342 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 21 Jun 2014 18:22:10 +0200
Subject: [PATCH] Update Mednafen targets

---
 libretro-build-android-mk.sh | 23 ++++++++++++++++++++++-
 libretro-build-common-xdk.sh |  2 +-
 libretro-build-common.sh     |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index ae1a708f..be59745e 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 vb; do
+      for core in pce_fast pcfx lynx wswan ngp; do
          echo "=== Building Mednafen ${core} ==="
          if [ -z "${NOCLEAN}" ]; then
             ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean mednafen_${core}"
@@ -82,6 +82,26 @@ build_libretro_mednafen_psx()
    fi
 }
 
+build_libretro_mednafen_vb()
+{
+   cd $BASE_DIR
+   pwd
+   if [ -d "libretro-mednafen-vb" ]; then
+      cd libretro-mednafen-vb
+      cd jni
+      echo "=== Building Mednafen VB ==="
+      if [ -z "${NOCLEAN}" ]; then
+         ndk-build clean APP_ABI="armeabi-v7a mips x86" || die "Failed to clean Mednafen PSX"
+      fi
+      ndk-build APP_ABI="armeabi-v7a mips x86" || die "Failed to build Mednafen VB"
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/mednafen_vb_libretro${FORMAT}.${FORMAT_EXT}
+   else
+      echo "Mednafen VB not fetched, skipping ..."
+   fi
+}
+
 build_libretro_mednafen_pce_fast()
 {
    cd $BASE_DIR
@@ -661,6 +681,7 @@ else
    build_libretro_bsnes
    build_libretro_mednafen
    build_libretro_mednafen_pce_fast
+   build_libretro_mednafen_vb
    build_libretro_mednafen_psx
    #build_libretro_mednafen_gba
    #build_libretro_mednafen_snes
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index f3f74d1d..80ccbc80 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 vb; do
+   for core in pcfx wswan ngp gba; do
    	cd $BASE_DIR
    	if [ -d "libretro-mednafen" ]; then
       		echo "=== Building Mednafen ${core} ==="
diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 0da9da0b..f67b25bb 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 vb; do
+      for core in pcfx lynx wswan ngp gba; do
          if [ -z "${NOCLEAN}" ]; then
             "${MAKE}" core="${core}" platform="${FORMAT_COMPILER_TARGET}" ${COMPILER} "-j${JOBS}" clean || die "Failed to clean mednafen/${core}"
          fi