From 879616b80db6c1f5daf92146efad72ca47202746 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sat, 18 May 2013 21:37:43 +0200
Subject: [PATCH] Script fixes

---
 libretro-build-common-console.sh | 10 +++++-----
 libretro-build-ios.sh            |  1 +
 libretro-build-qnx.sh            |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libretro-build-common-console.sh b/libretro-build-common-console.sh
index e5d1598f..00fc8c15 100644
--- a/libretro-build-common-console.sh
+++ b/libretro-build-common-console.sh
@@ -169,7 +169,7 @@ build_libretro_desmume()
          make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS
       fi
 
-      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
@@ -183,7 +183,7 @@ build_libretro_s9x()
       cd libretro-s9x/libretro
       make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean SNES9x"
       make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build SNES9x"
-      cp snes9x_libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"
+      cp snes9x_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "SNES9x not fetched, skipping ..."
    fi
@@ -195,9 +195,9 @@ build_libretro_s9x_next()
    if [ -d "libretro-s9x-next" ]; then
       echo "=== Building SNES9x-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"
+      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"
       cd ..
    else
       echo "SNES9x-Next not fetched, skipping ..."
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 23fcff8f..772fac6d 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -22,6 +22,7 @@ else
    build_libretro_mednafen
    build_libretro_mednafen_psx
    build_libretro_mednafen_gba
+   build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba_full
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index 165da944..eb8e9b7f 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -19,6 +19,7 @@ else
    build_libretro_mednafen
    build_libretro_mednafen_psx
    build_libretro_mednafen_gba
+   build_libretro_s9x
    build_libretro_s9x_next
    build_libretro_genplus
    build_libretro_fba_full