diff --git a/libretro-build-android.sh b/libretro-build-android.sh
index f3808598..f7f1b729 100755
--- a/libretro-build-android.sh
+++ b/libretro-build-android.sh
@@ -4,6 +4,7 @@ SCRIPT=$(readlink -f $0)
 BASE_DIR=$(dirname $SCRIPT)
 RARCH_DIR=$BASE_DIR/dist
 RARCH_DIST_DIR=$RARCH_DIR/android
+FORMAT_EXT=so
 JOBS=7
 
 die()
@@ -23,33 +24,33 @@ build_libretro_mednafen()
       ndk-build clean || die "Failed to clean mednafen_ngp"
       ndk-build core=ngp clean || die "Failed to clean mednafen_ngp"
       ndk-build core=ngp -j$JOBS || die "Failed to build mednafen_ngp"
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_ngp.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_mednafen_ngp.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_mednafen_ngp.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_ngp.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_mednafen_ngp.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_mednafen_ngp.${FORMAT_EXT}
 
       ndk-build clean || die "Failed to clean mednafen_wswan"
       ndk-build core=wswan clean || die "Failed to clean mednafen_wswan"
       ndk-build core=wswan -j$JOBS || die "Failed to build mednafen_wswan"
 
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_wswan.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_mednafen_wswan.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_mednafen_wswan.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_wswan.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_mednafen_wswan.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_mednafen_wswan.${FORMAT_EXT}
 
       ndk-build clean || die "Failed to clean mednafen_vb"
       ndk-build core=vb clean || die "Failed to clean mednafen_vb"
       ndk-build core=vb -j$JOBS || die "Failed to build mednafen_vb"
 
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_vb.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_mednafen_vb.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_mednafen_vb.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_vb.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_mednafen_vb.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_mednafen_vb.${FORMAT_EXT}
 
       ndk-build clean || die "Failed to clean mednafen_pce_fast"
       ndk-build core=pce-fast clean || die "Failed to clean mednafen_pce_fast"
       ndk-build core=pce-fast -j$JOBS || die "Failed to build mednafen_pce_fast"
 
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_pce_fast.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_mednafen_pce_fast.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_mednafen_pce_fast.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_mednafen_pce_fast.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_mednafen_pce_fast.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_mednafen_pce_fast.${FORMAT_EXT}
    else
       echo "Mednafen not fetched, skipping ..."
    fi
@@ -64,9 +65,9 @@ build_libretro_s9x_next()
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_snes9x_next.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_snes9x_next.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_snes9x_next.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_snes9x_next.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_snes9x_next.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_snes9x_next.${FORMAT_EXT}
    else
       echo "SNES9x-Next not fetched, skipping ..."
    fi
@@ -81,9 +82,9 @@ build_libretro_genplus()
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_genesis_plus_gx.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_genesis_plus_gx.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_genesis_plus_gx.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_genesis_plus_gx.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_genesis_plus_gx.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_genesis_plus_gx.${FORMAT_EXT}
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
@@ -99,9 +100,9 @@ build_libretro_fba()
       cd projectfiles/libretro-android/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_fba.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_fba.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_fba.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_fba.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_fba.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_fba.${FORMAT_EXT}
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
@@ -116,9 +117,9 @@ build_libretro_vba()
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_vba_next.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_vba_next.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_vba_next.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_vba_next.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_vba_next.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_vba_next.${FORMAT_EXT}
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
@@ -133,9 +134,9 @@ build_libretro_fceu()
       cd fceumm-code/src/drivers/libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_fceumm.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_fceumm.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_fceumm.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_fceumm.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_fceumm.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_fceumm.${FORMAT_EXT}
    else
       echo "FCEU not fetched, skipping ..."
    fi
@@ -150,9 +151,9 @@ build_libretro_gambatte()
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_gambatte.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_gambatte.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_gambatte.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_gambatte.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_gambatte.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_gambatte.${FORMAT_EXT}
    else
       echo "Gambatte not fetched, skipping ..."
    fi
@@ -167,9 +168,9 @@ build_libretro_nx()
       cd jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_nxengine.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_nxengine.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_nxengine.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_nxengine.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_nxengine.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_nxengine.${FORMAT_EXT}
    else
       echo "NXEngine not fetched, skipping ..."
    fi
@@ -184,9 +185,9 @@ build_libretro_prboom()
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_prboom.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_prboom.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_prboom.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_prboom.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_prboom.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_prboom.${FORMAT_EXT}
    else
       echo "PRBoom not fetched, skipping ..."
    fi
@@ -201,9 +202,9 @@ build_libretro_nestopia()
       cd jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_nestopia.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_nestopia.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_nestopia.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_nestopia.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_nestopia.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_nestopia.${FORMAT_EXT}
    else
       echo "Nestopia not fetched, skipping ..."
    fi
@@ -219,10 +220,10 @@ build_libretro_pcsx_rearmed()
       cd jni
       ndk-build clean
       ndk-build -j$JOBS NO_NEON=1
-      cp ../libs/armeabi-v7a/libretro-noneon.so $RARCH_DIST_DIR/armeabi-v7a/libretro_pcsx_rearmed.so
+      cp ../libs/armeabi-v7a/libretro-noneon.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_pcsx_rearmed.${FORMAT_EXT}
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_pcsx_rearmed-neon.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_pcsx_rearmed-neon.${FORMAT_EXT}
    else
       echo "PCSX ReARMed not fetched, skipping ..."
    fi
@@ -237,9 +238,9 @@ build_libretro_tyrquake()
       cd libretro/jni
       ndk-build clean
       ndk-build -j$JOBS
-      cp ../libs/armeabi-v7a/libretro.so $RARCH_DIST_DIR/armeabi-v7a/libretro_tyrquake.so
-      cp ../libs/mips/libretro.so $RARCH_DIST_DIR/mips/libretro_tyrquake.so
-      cp ../libs/x86/libretro.so $RARCH_DIST_DIR/x86/libretro_tyrquake.so
+      cp ../libs/armeabi-v7a/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/armeabi-v7a/libretro_tyrquake.${FORMAT_EXT}
+      cp ../libs/mips/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/mips/libretro_tyrquake.${FORMAT_EXT}
+      cp ../libs/x86/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/x86/libretro_tyrquake.${FORMAT_EXT}
    else
       echo "TyrQuake not fetched, skipping ..."
    fi
diff --git a/libretro-build-common-console.sh b/libretro-build-common-console.sh
index 273add55..ab848c3d 100644
--- a/libretro-build-common-console.sh
+++ b/libretro-build-common-console.sh
@@ -15,7 +15,7 @@ build_libretro_fba_full()
       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
+      cp fb_alpha_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
@@ -30,7 +30,7 @@ build_libretro_pcsx_rearmed()
       cd libretro-pcsx-rearmed
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean PCSX ReARMed"
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build PCSX ReARMed"
-      cp pcsx_rearmed_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
+      cp pcsx_rearmed_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "PCSX ReARMed not fetched, skipping ..."
    fi
@@ -51,7 +51,7 @@ build_libretro_mednafen()
       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.$FORMAT_EXT $RARCH_DIST_DIR
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
       done
    else
       echo "Mednafen not fetched, skipping ..."
@@ -70,7 +70,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.$FORMAT_EXT $RARCH_DIST_DIR
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
       done
    else
       echo "Mednafen not fetched, skipping ..."
@@ -89,7 +89,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.$FORMAT_EXT $RARCH_DIST_DIR
+         cp mednafen_$(echo ${core} | tr '[\-]' '[_]')_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
       done
    else
       echo "Mednafen not fetched, skipping ..."
@@ -105,7 +105,7 @@ build_libretro_stella()
       make -f Makefile clean
       make -f Makefile platform=$FORMAT_COMPILER_TARGET -j$JOBS
 
-      cp stella_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
+      cp stella_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Stella not fetched, skipping ..."
    fi
@@ -120,7 +120,7 @@ build_libretro_desmume()
       make -f Makefile.libretro clean
       make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS
 
-      cp desmume_libretro$FORMAT.$FORMAT_EXT $RARCH_DIST_DIR
+      cp desmume_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Desmume not fetched, skipping ..."
    fi
@@ -134,7 +134,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp snes9x_next_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
       cd ..
    else
       echo "SNES9x-Next not fetched, skipping ..."
@@ -149,7 +149,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp genesis_plus_gx_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
@@ -164,7 +164,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp vba_next_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
@@ -178,7 +178,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp fceumm-code/fceumm_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "FCEU not fetched, skipping ..."
    fi
@@ -192,7 +192,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp gambatte_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Gambatte not fetched, skipping ..."
    fi
@@ -206,7 +206,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp nxengine_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "NXEngine not fetched, skipping ..."
    fi
@@ -220,7 +220,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp prboom_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "PRBoom not fetched, skipping ..."
    fi
@@ -234,7 +234,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.$FORMAT_EXT $RARCH_DIST_DIR
+      cp nestopia_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Nestopia not fetched, skipping ..."
    fi
@@ -248,7 +248,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.$FORMAT_EXT $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-common-gx.sh b/libretro-build-common-gx.sh
index ff1f273c..b2c38bb9 100644
--- a/libretro-build-common-gx.sh
+++ b/libretro-build-common-gx.sh
@@ -9,27 +9,27 @@ build_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
+      cp fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR
 
       echo "=== Building Final Burn Alpha Cores (CPS1) ==="
       cd fbacores/cps1
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores CPS1"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores CPS1"
-      cp fb_alpha_libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.a
+      cp fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.${FORMAT_EXT}
       cd ../../
       
       echo "=== Building Final Burn Alpha Cores (CPS2) ==="
       cd fbacores/cps2
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores CPS2"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores CPS2"
-      cp libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.a
+      cp libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.${FORMAT_EXT}
       cd ../../
 
       echo "=== Building Final Burn Alpha Cores (NeoGeo) ==="
       cd fbacores/neogeo
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean Final Burn Alpha Cores NeoGeo"
       make -f makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS || die "Failed to build Final Burn Alpha Cores NeoGeo"
-      cp libretro$FORMAT.a $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.a
+      cp libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.${FORMAT_EXT}
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
diff --git a/libretro-build-common-xdk.sh b/libretro-build-common-xdk.sh
index bc10a036..8834fde8 100644
--- a/libretro-build-common-xdk.sh
+++ b/libretro-build-common-xdk.sh
@@ -15,22 +15,22 @@ build_libretro_mednafen()
       cd msvc/pce-fast
 
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/mednafen_pce_fast_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      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.$LIB_EXT $RARCH_DIST_DIR
+      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.$LIB_EXT $RARCH_DIST_DIR
+      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.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/mednafen_vb_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Mednafen not fetched, skipping ..."
    fi
@@ -44,7 +44,7 @@ build_libretro_s9x_next()
       cd libretro-s9x-next/
       cd libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/snes9x_next_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/snes9x_next_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "SNES9x-Next not fetched, skipping ..."
    fi
@@ -58,7 +58,7 @@ build_libretro_genplus()
       cd libretro-genplus/
       cd libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/genesis_plus_gx_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/genesis_plus_gx_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Genplus GX not fetched, skipping ..."
    fi
@@ -72,7 +72,7 @@ build_libretro_vba()
       cd libretro-vba/
       cd libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release/vba_next_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release/vba_next_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "VBA-Next not fetched, skipping ..."
    fi
@@ -86,7 +86,7 @@ build_libretro_fceu()
       cd libretro-fceu
       cd fceumm-code/src/drivers/libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/fceumm_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/fceumm_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "FCEU not fetched, skipping ..."
    fi
@@ -100,7 +100,7 @@ build_libretro_gambatte()
       cd libretro-gambatte/libgambatte
       cd libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/gambatte_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/gambatte_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Gambatte not fetched, skipping ..."
    fi
@@ -114,7 +114,7 @@ build_libretro_nx()
       cd libretro-nx
       cd nxengine-1.0.0.4/libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/nxengine_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/nxengine_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "NXEngine not fetched, skipping ..."
    fi
@@ -128,7 +128,7 @@ build_libretro_prboom()
       cd libretro-prboom
       cd libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/prboom_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/prboom_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "PRBoom not fetched, skipping ..."
    fi
@@ -142,7 +142,7 @@ build_libretro_nestopia()
       cd libretro-nestopia/libretro
       cd msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/nestopia_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/nestopia_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Nestopia not fetched, skipping ..."
    fi
@@ -156,7 +156,7 @@ build_libretro_tyrquake()
       cd libretro-tyrquake
       cd libretro/msvc
       cmd.exe /k $MSVC_NAME.bat
-      cp $MSVC_NAME/Release_LTCG/tyrquake_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp $MSVC_NAME/Release_LTCG/tyrquake_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Tyr Quake not fetched, skipping ..."
    fi
diff --git a/libretro-build-xdk1.sh b/libretro-build-xdk1.sh
index 9d5bb2ba..2b1d71ed 100644
--- a/libretro-build-xdk1.sh
+++ b/libretro-build-xdk1.sh
@@ -4,7 +4,7 @@ BASE_DIR=$(pwd)
 RARCH_DIR=$BASE_DIR/dist
 RARCH_DIST_DIR=$RARCH_DIR/xdk1
 FORMAT=_xdk
-LIB_EXT=lib
+FORMAT_EXT=lib
 MSVC_NAME=msvc-2003-xbox1
 
 die()
@@ -22,24 +22,24 @@ build_libretro_fba()
       cd svn-current/trunk
       cd projectfiles/visualstudio-2003-libretro-xbox1
       cmd.exe /k $MSVC_NAME.bat
-      cp Release_LTCG/fb_alpha_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp Release_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR
 
       echo "=== Building Final Burn Alpha Cores (CPS1) ==="
       cd ../../fbacores/cps1/projectfiles/visualstudio-2003-libretro-xbox1
       cmd.exe /k $MSVC_NAME.bat
-      cp Release_LTCG/fb_alpha_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.$LIB_EXT
+      cp Release_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps1_libretro$FORMAT.${FORMAT_EXT}
       cd ../../../../
 
       echo "=== Building Final Burn Alpha Cores (CPS2) ==="
       cd fbacores/cps2/projectfiles/visualstudio-2003-libretro-xbox1
       cmd.exe /k $MSVC_NAME.bat
-      cp Release_LTCG/libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.$LIB_EXT
+      cp Release_LTCG/libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_cps2_libretro$FORMAT.${FORMAT_EXT}
       cd ../../../../
 
       echo "=== Building Final Burn Alpha Cores (NeoGeo) ==="
       cd fbacores/neogeo/projectfiles/visualstudio-2003-libretro-xbox1
       cmd.exe /k $MSVC_NAME.bat
-      cp Release_LTCG/libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.$LIB_EXT
+      cp Release_LTCG/libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR/fba_cores_neo_libretro$FORMAT.${FORMAT_EXT}
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi
diff --git a/libretro-build-xdk360.sh b/libretro-build-xdk360.sh
index 260eb6bf..4f862be9 100644
--- a/libretro-build-xdk360.sh
+++ b/libretro-build-xdk360.sh
@@ -4,7 +4,7 @@ BASE_DIR=$(pwd)
 RARCH_DIR=$BASE_DIR/dist
 RARCH_DIST_DIR=$RARCH_DIR/xdk360
 FORMAT=_xdk360
-LIB_EXT=lib
+FORMAT_EXT=lib
 MSVC_NAME=msvc-2010-360
 
 die()
@@ -22,7 +22,7 @@ build_libretro_fba()
       cd svn-current/trunk
       cd projectfiles/visualstudio-2010-libretro-360
       cmd.exe /k $MSVC_NAME.bat
-      cp Release_LTCG/fb_alpha_libretro$FORMAT.$LIB_EXT $RARCH_DIST_DIR
+      cp Release_LTCG/fb_alpha_libretro$FORMAT.${FORMAT_EXT} $RARCH_DIST_DIR
    else
       echo "Final Burn Alpha not fetched, skipping ..."
    fi