diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index e16a4bfd..04b745b9 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -6,33 +6,78 @@ die()
    #exit 1
 }
 
-build_libretro_mednafen()
+build_libretro_mednafen_pce_fast()
 {
    cd $BASE_DIR
    if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen ==="
+      echo "=== Building Mednafen PCE Fast ==="
       cd libretro-mednafen
       cd msvc/pce-fast
 
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
-
-      cd ../
-      cd wswan
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/mednafen_wswan_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
-
-      cd ../
-      cd ngp
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/mednafen_ngp_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
-
-      cd ../
-      cd vb
-      cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/$RELEASE_LTCG/mednafen_vb_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT
    else
-      echo "Mednafen not fetched, skipping ..."
+      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
+}
+
+build_libretro_mednafen_gba()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-mednafen" ]; then
+      echo "=== Building Mednafen GBA ==="
+      cd libretro-mednafen
+      cd msvc/gba
+
+      cmd.exe /k $MSVC_NAME.bat
+      cp $MSVC_NAME/$RELEASE_LTCG/${MSVC_NAME}.${FORMAT_EXT} "$RARCH_DIST_DIR"/mednafen_gba_libretro$FORMAT.$FORMAT_EXT
+   else
+      echo "Mednafen GBA not fetched, skipping ..."
    fi
 }
 
diff --git a/libretro-build-win.sh b/libretro-build-win.sh
index e7048246..e6f310b6 100644
--- a/libretro-build-win.sh
+++ b/libretro-build-win.sh
@@ -20,7 +20,10 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   #build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
+   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 bac5413a..5588c9e9 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -79,7 +79,10 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
+   build_libretro_mednafen_ngp
+   build_libretro_mednafen_wswan
+   build_libretro_mednafen_vb
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index bdd082be..22e94023 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -35,7 +35,10 @@ source $BASE_DIR/libretro-build-common-xdk.sh
 if [ $1 ]; then
    $1
 else
-   build_libretro_mednafen
+   build_libretro_mednafen_pce_fast
+   build_libretro_mednafen_ngp
+   build_libretro_mednafen_vb
+   build_libretro_mednafen_wswan
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba