diff --git a/libretro-build-common-console.sh b/libretro-build-common-console.sh
index 1d88a1df..dd43c08c 100644
--- a/libretro-build-common-console.sh
+++ b/libretro-build-common-console.sh
@@ -6,6 +6,21 @@ die()
    #exit 1
 }
 
+build_libretro_fba_full()
+{
+   cd $BASE_DIR
+   if [ -d "libretro-fba" ]; then
+		echo "=== Building Final Burn Alpha (Full) ==="
+      cd libretro-fba/
+      cd svn-current/trunk
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha"
+      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha"
+      cp fb_alpha_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
+   else
+      echo "Final Burn Alpha not fetched, skipping ..."
+   fi
+}
+
 build_libretro_mednafen()
 {
    cd $BASE_DIR
@@ -16,12 +31,12 @@ build_libretro_mednafen()
 
       make core=pce-fast platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean mednafen/${core}"
       make core=pce-fast platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build mednafen/${core}"
-      cp mednafen_pce_fast_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp mednafen_pce_fast_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
       for core in wswan ngp vb
       do
          make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean mednafen/${core}"
          make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build mednafen/${core}"
-         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.a $RARCH_DIST_DIR
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
       done
    else
       echo "Mednafen not fetched, skipping ..."
@@ -40,7 +55,7 @@ build_libretro_mednafen_psx()
       do
          make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean mednafen/${core}"
          make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build mednafen/${core}"
-         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.a $RARCH_DIST_DIR
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
       done
    else
       echo "Mednafen not fetched, skipping ..."
@@ -59,7 +74,7 @@ build_libretro_mednafen_gba()
       do
          make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean mednafen/${core}"
          make core=${core} platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build mednafen/${core}"
-         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.a $RARCH_DIST_DIR
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
       done
    else
       echo "Mednafen not fetched, skipping ..."
@@ -104,7 +119,7 @@ build_libretro_s9x_next()
       cd libretro-s9x-next/
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to build SNES9x-Next"
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build SNES9x-Next"
-      cp snes9x_next_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp snes9x_next_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
       cd ..
    else
       echo "SNES9x-Next not fetched, skipping ..."
@@ -119,7 +134,7 @@ build_libretro_genplus()
       cd libretro-genplus/
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Genplus GX"
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Genplus GX"
-      cp genesis_plus_gx_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp genesis_plus_gx_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
@@ -134,7 +149,7 @@ build_libretro_vba()
       cd libretro-vba/
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean VBA-Next"
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build VBA-Next"
-      cp vba_next_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp vba_next_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
@@ -148,7 +163,7 @@ build_libretro_fceu()
       cd libretro-fceu
       make -C fceumm-code -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean FCEUmm"
       make -C fceumm-code -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build FCEUmm"
-      cp fceumm-code/fceumm_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp fceumm-code/fceumm_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "FCEU not fetched, skipping ..."
    fi
@@ -162,7 +177,7 @@ build_libretro_gambatte()
       cd libretro-gambatte/libgambatte
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean Gambatte"
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build Gambatte"
-      cp gambatte_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp gambatte_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "Gambatte not fetched, skipping ..."
    fi
@@ -176,7 +191,7 @@ build_libretro_nx()
       cd libretro-nx
       make platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean NXEngine"
       make platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build NXEngine"
-      cp nxengine_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp nxengine_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "NXEngine not fetched, skipping ..."
    fi
@@ -190,7 +205,7 @@ build_libretro_prboom()
       cd libretro-prboom
       make platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS clean || die "Failed to clean PRBoom"
       make platform=$FORMAT_COMPILER_TARGET_ALT -j$JOBS || die "Failed to build PRBoom"
-      cp prboom_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp prboom_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "PRBoom not fetched, skipping ..."
    fi
@@ -204,7 +219,7 @@ build_libretro_nestopia()
       cd libretro-nestopia/libretro
       make platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Nestopia"
       make platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Nestopia"
-      cp nestopia_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp nestopia_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "Nestopia not fetched, skipping ..."
    fi
@@ -218,7 +233,7 @@ build_libretro_tyrquake()
       cd libretro-tyrquake
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Tyr Quake"
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Tyr Quake"
-      cp tyrquake_libretro$FORMAT.a $RARCH_DIST_DIR
+      cp tyrquake_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
    else
       echo "Tyr Quake not fetched, skipping ..."
    fi
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 7f960f46..e6a19ebe 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -5,206 +5,15 @@ set -e
 BASE_DIR="$PWD"
 RARCH_DIR=$BASE_DIR/dist
 RARCH_DIST_DIR=$RARCH_DIR/ios
-JOBS=4
+#FORMAT=_ios
+FORMAT_COMPILER_TARGET=ios
+FORMAT_COMPILER_TARGET_ALT=ios
+FORMAT_EXT=dylib
+JOBS=7
 
 export IOSSDK=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/
 
-build_libretro_mednafen()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen ==="
-      cd libretro-mednafen
-
-      for core in psx pce-fast wswan ngp gba vb
-      do
-			make -f Makefile platform=ios core=${core} clean
-         make -f Makefile platform=ios core=${core} -j${JOBS} || die "Failed to build mednafen/${core}"
-         cp "mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro.dylib" "$RARCH_DIST_DIR"
-      done
-   else
-      echo "Mednafen not fetched, skipping ..."
-   fi
-}
-
-build_libretro_s9x_next()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-s9x-next" ]; then
-      echo "=== Building SNES9x-Next ==="
-      cd libretro-s9x-next/
-      make -f Makefile.libretro clean
-      make -f Makefile.libretro platform=ios
-
-      cp "snes9x_next_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "SNES9x-Next not fetched, skipping ..."
-   fi
-}
-
-build_libretro_genplus()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-genplus" ]; then
-      echo "=== Building Genplus GX ==="
-      cd libretro-genplus/
-      make -f Makefile.libretro clean
-      make -f Makefile.libretro platform=ios
-
-      cp "genesis_plus_gx_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "Genplus GX not fetched, skipping ..."
-   fi
-}
-
-build_libretro_fba()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-fba" ]; then
-      echo "=== Building Final Burn Alpha ==="
-      cd libretro-fba
-      cd svn-current/trunk
-      make -f makefile.libretro clean
-      make -f makefile.libretro platform=ios
-
-      cp "fb_alpha_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "Final Burn Alpha not fetched, skipping ..."
-   fi
-}
-
-build_libretro_vba()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-vba" ]; then
-      echo "=== Building VBA-Next ==="
-      cd libretro-vba/
-		make -f Makefile.libretro platform=ios clean
-      make -f Makefile.libretro platform=ios -j4 || die "Failed to build VBA-Next"
-      cp "vba_next_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "VBA-Next not fetched, skipping ..."
-   fi
-}
-
-build_libretro_fceu()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-fceu" ]; then
-      echo "=== Building FCEU ==="
-      cd libretro-fceu
-		make -C fceumm-code -f Makefile.libretro clean
-      make -C fceumm-code -f Makefile.libretro platform=ios -j4 || die "Failed to build FCEU"
-      cp "fceumm-code/fceumm_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "FCEU not fetched, skipping ..."
-   fi
-}
-
-build_libretro_gambatte()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-gambatte" ]; then
-      echo "=== Building Gambatte ==="
-      cd libretro-gambatte/libgambatte
-      make -f Makefile.libretro clean
-      make -f Makefile.libretro platform=ios
-
-      cp "gambatte_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "Gambatte not fetched, skipping ..."
-   fi
-}
-
-build_libretro_nx()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-nx" ]; then
-      echo "=== Building NXEngine ==="
-      cd libretro-nx
-      make -f Makefile clean
-      make -f Makefile platform=ios
-
-      cp "nxengine_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "NXEngine not fetched, skipping ..."
-   fi
-}
-
-build_libretro_prboom()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-prboom" ]; then
-      echo "=== Building PRBoom ==="
-      cd libretro-prboom
-      make -f Makefile clean
-      make -f Makefile platform=ios
-
-      cp "prboom_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "PRBoom not fetched, skipping ..."
-   fi
-}
-
-build_libretro_stella()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-stella" ]; then
-      echo "=== Building Stella ==="
-      cd libretro-stella
-      make -f Makefile clean
-      make -f Makefile platform=ios
-
-      cp "stella_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "Stella not fetched, skipping ..."
-   fi
-}
-
-build_libretro_desmume()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-desmume" ]; then
-      echo "=== Building Desmume ==="
-      cd libretro-desmume
-      make -f Makefile.libretro clean
-      make -f Makefile.libretro platform=ios
-
-      cp "desmume_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "Desmume not fetched, skipping ..."
-   fi
-}
-
-build_libretro_nestopia()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-nestopia" ]; then
-      echo "=== Building Nestopia ==="
-      cd libretro-nestopia/libretro
-      make clean
-      make -f Makefile platform=ios
-
-      cp "nestopia_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "Nestopia not fetched, skipping ..."
-   fi
-}
-
-build_libretro_tyrquake()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-tyrquake" ]; then
-      echo "=== Building TyrQuake ==="
-      cd libretro-tyrquake
-      make -f Makefile.libretro clean
-      make -f Makefile.libretro platform=ios
-
-      cp "tyrquake_libretro.dylib" "$RARCH_DIST_DIR"
-   else
-      echo "TyrQuake not fetched, skipping ..."
-   fi
-}
+. libretro-build-common-console.sh
 
 create_dist_dir()
 {
@@ -224,9 +33,11 @@ create_dist_dir()
 create_dist_dir
 
 build_libretro_mednafen
+build_libretro_mednafen_psx
+build_libretro_mednafen_gba
 build_libretro_s9x_next
 build_libretro_genplus
-build_libretro_fba
+build_libretro_fba_full
 build_libretro_vba
 build_libretro_fceu
 build_libretro_gambatte
@@ -236,4 +47,3 @@ build_libretro_stella
 build_libretro_desmume
 build_libretro_nestopia
 build_libretro_tyrquake
-
diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh
index d9195233..107f3d30 100755
--- a/libretro-build-ngc.sh
+++ b/libretro-build-ngc.sh
@@ -7,6 +7,7 @@ RARCH_DIST_DIR=$RARCH_DIR/ngc
 FORMAT=_ngc
 FORMAT_COMPILER_TARGET=ngc
 FORMAT_COMPILER_TARGET_ALT=ngc
+FORMAT_EXT=a
 JOBS=7
 MY_DIR=$(dirname $(readlink -f $0))
 
diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh
index 1def8106..e0f0734a 100755
--- a/libretro-build-ps3.sh
+++ b/libretro-build-ps3.sh
@@ -7,30 +7,16 @@ RARCH_DIST_DIR=$RARCH_DIR/ps3
 FORMAT=_ps3
 FORMAT_COMPILER_TARGET=ps3
 FORMAT_COMPILER_TARGET_ALT=sncps3
+FORMAT_EXT=a
 JOBS=7
 MY_DIR=$(dirname $(readlink -f $0))
 
 . $MY_DIR/libretro-build-common-console.sh
 
-build_libretro_fba()
-{
-   cd $BASE_DIR
-   if [ -d "libretro-fba" ]; then
-      echo "=== Building Final Burn Alpha ==="
-      cd libretro-fba/
-      cd svn-current/trunk
-      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha"
-      make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha"
-      cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR
-   else
-      echo "Final Burn Alpha not fetched, skipping ..."
-   fi
-}
-
 build_libretro_mednafen
 build_libretro_s9x_next
 build_libretro_genplus
-build_libretro_fba
+build_libretro_fba_full
 build_libretro_vba
 build_libretro_fceu
 build_libretro_gambatte
diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh
index bef0d95a..c437f864 100755
--- a/libretro-build-wii.sh
+++ b/libretro-build-wii.sh
@@ -7,6 +7,7 @@ RARCH_DIST_DIR=$RARCH_DIR/wii
 FORMAT=_wii
 FORMAT_COMPILER_TARGET=wii
 FORMAT_COMPILER_TARGET_ALT=wii
+FORMAT_EXT=a
 JOBS=7
 MY_DIR=$(dirname $(readlink -f $0))