From 98e31a791018a9086966fdbe4467c766d05a82f1 Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sat, 26 Apr 2014 15:58:30 -0700
Subject: [PATCH] (MSVC) Simplify build rules

---
 libretro-build-common-xdk.sh | 70 +++++++-----------------------------
 libretro-build-win.sh        |  5 +--
 libretro-build-xdk1.sh       |  5 +--
 libretro-build-xdk360.sh     |  5 +--
 4 files changed, 16 insertions(+), 69 deletions(-)

diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index fed1aaae..0aa8e802 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -6,64 +6,20 @@ die()
    #exit 1
 }
 
-build_libretro_mednafen_pce_fast()
+build_libretro_mednafen()
 {
-   cd $BASE_DIR
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen PCE Fast ==="
-      cd libretro-mednafen
-      cd msvc/pce-fast
-
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT
-   else
-      echo "Mednafen PCE Fast not fetched, skipping ..."
-   fi
-}
-
-build_libretro_mednafen_wswan()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen Wswan ==="
-      cd libretro-mednafen
-      cd msvc/wswan
-
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_wswan_libretro$FORMAT.$FORMAT_EXT
-   else
-      echo "Mednafen Wswan not fetched, skipping ..."
-   fi
-}
-
-build_libretro_mednafen_ngp()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen NGP ==="
-      cd libretro-mednafen
-      cd msvc/ngp
-
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_ngp_libretro$FORMAT.$FORMAT_EXT
-   else
-      echo "Mednafen NGP not fetched, skipping ..."
-   fi
-}
-
-build_libretro_mednafen_vb()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen VB ==="
-      cd libretro-mednafen
-      cd msvc/vb
-
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_vb_libretro$FORMAT.$FORMAT_EXT
-   else
-      echo "Mednafen VB not fetched, skipping ..."
-   fi
+   for core in pce_fast pcfx wswan ngp vb; do
+   	cd $BASE_DIR
+   	if [ -d "libretro-mednafen" ]; then
+      		echo "=== Building Mednafen ${core} ==="
+      		cd libretro-mednafen
+      		cd msvc/${core}
+      		cmd.exe /k $MSVC_NAME.bat
+      		cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_${core}_libretro$FORMAT.$FORMAT_EXT
+   	else
+      		echo "Mednafen not fetched, skipping ..."
+   	fi
+   done
 }
 
 build_libretro_mednafen_gba()
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index aa765ff2..e5e0061a 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -20,11 +20,8 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen_pce_fast
+   build_libretro_mednafen
    build_libretro_mednafen_gba
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_vb
-   build_libretro_mednafen_wswan
    build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index b4fa8420..07fe5b8c 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -79,10 +79,7 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_wswan
-   build_libretro_mednafen_vb
+   build_libretro_mednafen
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 728a47bd..ba5cacf5 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -35,10 +35,7 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen_pce_fast
-   build_libretro_mednafen_ngp
-   build_libretro_mednafen_vb
-   build_libretro_mednafen_wswan
+   build_libretro_mednafen
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba