From 4fb2082ac4bb51a70c58d0d2cc7e7f6115650440 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sun, 19 May 2013 00:12:36 +0200
Subject: [PATCH] Use libretro-build.sh now for Mingw - might be that we still
 need to pass CC and CXX as params to the Makefile

---
 libretro-build-common-console.sh | 156 ++++++++-------
 libretro-build-win32.sh          | 326 -------------------------------
 libretro-build.sh                |  35 +++-
 3 files changed, 119 insertions(+), 398 deletions(-)
 delete mode 100755 libretro-build-win32.sh

diff --git a/libretro-build-common-console.sh b/libretro-build-common-console.sh
index 00fc8c15..25782d58 100644
--- a/libretro-build-common-console.sh
+++ b/libretro-build-common-console.sh
@@ -13,8 +13,8 @@ build_libretro_fba_full()
 		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"
+      ${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 ..."
@@ -30,11 +30,11 @@ build_libretro_pcsx_rearmed()
       cd libretro-pcsx-rearmed
       if [ $ARMV7 = true ]; then
          echo "=== Building PCSX ReARMed (ARMV7 NEON) ==="
-         make -f Makefile.libretro platform=arm -j$JOBS clean || die "Failed to clean PCSX ReARMed"
-         make -f Makefile.libretro platform=arm -j$JOBS || die "Failed to build PCSX ReARMed"
+         ${MAKE} -f Makefile.libretro platform=arm -j$JOBS clean || die "Failed to clean PCSX ReARMed"
+         ${MAKE} -f Makefile.libretro platform=arm -j$JOBS || die "Failed to build PCSX ReARMed"
       else
-         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"
+         ${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"
       fi
       cp pcsx_rearmed_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
@@ -50,13 +50,13 @@ build_libretro_mednafen()
       echo "=== Building Mednafen ==="
       cd 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}"
+      ${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.$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}"
+         ${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"
       done
    else
@@ -74,8 +74,8 @@ build_libretro_mednafen_psx()
 
       for core in 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}"
+         ${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"
       done
    else
@@ -93,8 +93,8 @@ build_libretro_mednafen_gba()
 
       for core in 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}"
+         ${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"
       done
    else
@@ -112,8 +112,8 @@ build_libretro_mednafen_snes()
 
       for core in snes
       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}"
+         ${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"
       done
    else
@@ -127,8 +127,8 @@ build_libretro_stella()
    if [ -d "libretro-stella" ]; then
       echo "=== Building Stella ==="
       cd libretro-stella
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} clean
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} clean
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS
 
       cp stella_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
@@ -142,8 +142,8 @@ build_libretro_quicknes()
    if [ -d "libretro-quicknes" ]; then
       echo "=== Building QuickNES ==="
       cd libretro-quicknes/libretro
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean QuickNES"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build QuickNES"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean QuickNES"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build QuickNES"
       cp quicknes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "QuickNES not fetched, skipping ..."
@@ -158,15 +158,15 @@ build_libretro_desmume()
       cd libretro-desmume
       if [ $X86 = true ]; then
          echo "=== Building Desmume with x86 JIT recompiler ==="
-         make -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} DESMUME_JIT=1 -j$JOBS clean || die "Failed to clean Desmume"
-         make -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} DESMUME_JIT=1 -j$JOBS || die "Failed to build Desmume"
+         ${MAKE} -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} DESMUME_JIT=1 -j$JOBS clean || die "Failed to clean Desmume"
+         ${MAKE} -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} DESMUME_JIT=1 -j$JOBS || die "Failed to build Desmume"
       elif [ $ARMV7 = true ]; then
          echo "=== Building Desmume with ARMv7 JIT recompiler ==="
-         make -f Makefile.libretro platform=arm DESMUME_JIT=1 -j$JOBS clean || die "Failed to clean Desmume"
-         make -f Makefile.libretro platform=arm DESMUME_JIT=1 -j$JOBS || die "Failed to build Desmume"
+         ${MAKE} -f Makefile.libretro platform=arm DESMUME_JIT=1 -j$JOBS clean || die "Failed to clean Desmume"
+         ${MAKE} -f Makefile.libretro platform=arm DESMUME_JIT=1 -j$JOBS || die "Failed to build Desmume"
       else
-         make -f Makefile.libretro clean
-         make -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS
+         ${MAKE} -f Makefile.libretro clean
+         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET -j$JOBS
       fi
 
       cp desmume_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
@@ -181,8 +181,8 @@ build_libretro_s9x()
    if [ -d "libretro-s9x" ]; then
       echo "=== Building SNES9x ==="
       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"
+      ${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}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "SNES9x not fetched, skipping ..."
@@ -195,8 +195,8 @@ 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"
+      ${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
@@ -210,8 +210,8 @@ build_libretro_genplus()
    if [ -d "libretro-genplus" ]; then
       echo "=== Building Genplus GX ==="
       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"
+      ${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"
    else
       echo "Genplus GX not fetched, skipping ..."
@@ -225,8 +225,8 @@ build_libretro_mame078()
       echo "=== Building MAME 0.78 ==="
       cd libretro-mame078
 
-      make -f makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean MAME 0.78"
-      make -f makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build MAME 0.78"
+      ${MAKE} -f makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean MAME 0.78"
+      ${MAKE} -f makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build MAME 0.78"
       cp mame078_libretro.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "MAME 0.78 not fetched, skipping ..."
@@ -239,8 +239,8 @@ build_libretro_vba()
    if [ -d "libretro-vba" ]; then
       echo "=== Building VBA-Next ==="
       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"
+      ${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"
    else
       echo "VBA-Next not fetched, skipping ..."
@@ -253,8 +253,8 @@ build_libretro_fceu()
    if [ -d "libretro-fceu" ]; then
       echo "=== Building FCEUmm ==="
       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"
+      ${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"
    else
       echo "FCEUmm not fetched, skipping ..."
@@ -267,8 +267,8 @@ build_libretro_gambatte()
    if [ -d "libretro-gambatte" ]; then
       echo "=== Building 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"
+      ${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"
    else
       echo "Gambatte not fetched, skipping ..."
@@ -281,8 +281,8 @@ build_libretro_nx()
    if [ -d "libretro-nx" ]; then
       echo "=== Building NXEngine ==="
       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"
+      ${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"
    else
       echo "NXEngine not fetched, skipping ..."
@@ -295,8 +295,8 @@ build_libretro_prboom()
    if [ -d "libretro-prboom" ]; then
       echo "=== Building 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"
+      ${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"
    else
       echo "PRBoom not fetched, skipping ..."
@@ -309,8 +309,8 @@ build_libretro_meteor()
    if [ -d "libretro-meteor" ]; then
       echo "=== Building Meteor ==="
       cd libretro-meteor/libretro
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean Meteor"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build Meteor"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean Meteor"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build Meteor"
       cp meteor_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "Meteor not fetched, skipping ..."
@@ -323,8 +323,8 @@ build_libretro_nestopia()
    if [ -d "libretro-nestopia" ]; then
       echo "=== Building 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"
+      ${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"
    else
       echo "Nestopia not fetched, skipping ..."
@@ -337,8 +337,8 @@ build_libretro_tyrquake()
    if [ -d "libretro-tyrquake" ]; then
       echo "=== Building Tyr Quake ==="
       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"
+      ${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"
    else
       echo "Tyr Quake not fetched, skipping ..."
@@ -351,8 +351,8 @@ build_libretro_modelviewer()
    if [ -d "libretro-gl-modelviewer" ]; then
       echo "=== Building Modelviewer (GL) ==="
       cd libretro-gl-modelviewer
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean Modelviewer"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build Modelviewer"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean Modelviewer"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build Modelviewer"
       cp modelviewer_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "ModelViewer not fetched, skipping ..."
@@ -365,8 +365,8 @@ build_libretro_scenewalker()
    if [ -d "libretro-gl-scenewalker" ]; then
       echo "=== Building SceneWalker (GL) ==="
       cd libretro-gl-scenewalker
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean SceneWalker"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build SceneWalker"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean SceneWalker"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build SceneWalker"
       cp scenewalker_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "SceneWalker not fetched, skipping ..."
@@ -379,8 +379,8 @@ build_libretro_scummvm()
    if [ -d "libretro-scummvm" ]; then
       echo "=== Building ScummVM ==="
       cd libretro-scummvm/backends/platform/libretro/build
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean ScummVM"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build ScummVM"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean ScummVM"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build ScummVM"
       cp scummvm_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "ScummVM not fetched, skipping ..."
@@ -393,8 +393,8 @@ build_libretro_dosbox()
    if [ -d "libretro-dosbox" ]; then
       echo "=== Building DOSbox ==="
       cd libretro-dosbox
-      make -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean DOSbox"
-      make -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build DOSbox"
+      ${MAKE} -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} -j$JOBS clean || die "Failed to clean DOSbox"
+      ${MAKE} -f Makefile.libretro platform=${FORMAT_COMPILER_TARGET} -j$JOBS || die "Failed to build DOSbox"
       cp dosbox_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"
    else
       echo "DOSbox not fetched, skipping ..."
@@ -407,9 +407,15 @@ build_libretro_bsnes()
    if [ -d "libretro-bsnes/perf" ]; then
       echo "=== Building bSNES performance ==="
       cd libretro-bsnes/perf/higan
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=performance -j$JOBS clean || die "Failed to clean bSNES performance core"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=performance -j$JOBS || die "Failed to build bSNES performance core"
-      cp -f out/libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_performance.${FORMAT_EXT}
+      rm -f obj/*.o
+      rm -f out/*.${FORMAT_EXT}
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=performance -j$JOBS clean || die "Failed to clean bSNES performance core"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=performance -j$JOBS || die "Failed to build bSNES performance core"
+      if [ $FORMAT_COMPILER_TARGET == "win" ]; then
+      	cp -f out/retro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_performance.${FORMAT_EXT}
+      else
+      	cp -f out/libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_performance.${FORMAT_EXT}
+      fi
    else
       echo "bSNES performance not fetched, skipping ..."
    fi
@@ -418,9 +424,15 @@ build_libretro_bsnes()
    if [ -d "libretro-bsnes/balanced" ]; then
       echo "=== Building bSNES balanced ==="
       cd libretro-bsnes/balanced/higan
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=balanced -j$JOBS clean || die "Failed to clean bSNES balanced core"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=balanced -j$JOBS || die "Failed to build bSNES balanced core"
-      cp -f out/libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_balanced.${FORMAT_EXT}
+      rm -f obj/*.o
+      rm -f out/*.${FORMAT_EXT}
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=balanced -j$JOBS clean || die "Failed to clean bSNES balanced core"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=balanced -j$JOBS || die "Failed to build bSNES balanced core"
+      if [ $FORMAT_COMPILER_TARGET == "win" ]; then
+      	cp -f out/retro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_balanced.${FORMAT_EXT}
+      else
+      	cp -f out/libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_balanced.${FORMAT_EXT}
+      fi
    else
       echo "bSNES compat not fetched, skipping ..."
    fi
@@ -429,9 +441,15 @@ build_libretro_bsnes()
    if [ -d "libretro-bsnes" ]; then
       echo "=== Building bSNES accuracy ==="
       cd libretro-bsnes/higan
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS clean || die "Failed to clean bSNES accuracy core"
-      make -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS || die "Failed to build bSNES accuracy core"
-      cp -f out/libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_accuracy.${FORMAT_EXT}
+      rm -f obj/*.o
+      rm -f out/*.${FORMAT_EXT}
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS clean || die "Failed to clean bSNES accuracy core"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS || die "Failed to build bSNES accuracy core"
+      if [ $FORMAT_COMPILER_TARGET == "win" ]; then
+      	cp -f out/retro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_accuracy.${FORMAT_EXT}
+      else
+      	cp -f out/libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_accuracy.${FORMAT_EXT}
+      fi
    fi
 }
 
@@ -442,8 +460,8 @@ build_libretro_bnes()
       echo "=== Building bNES ==="
       cd libretro-bnes
       mkdir -p obj
-      make -j$JOBS clean || die "Failed to clean bNES"
-      make -j$JOBS || die "Failed to build bNES"
+      ${MAKE} -j$JOBS clean || die "Failed to clean bNES"
+      ${MAKE} -j$JOBS || die "Failed to build bNES"
       cp libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bnes_libretro.${FORMAT_EXT}
    else
       echo "bNES not fetched, skipping ..."
diff --git a/libretro-build-win32.sh b/libretro-build-win32.sh
deleted file mode 100755
index 5454fbb6..00000000
--- a/libretro-build-win32.sh
+++ /dev/null
@@ -1,326 +0,0 @@
-#!/bin/sh
-
-SCRIPT=$(readlink -f "$0")
-BASE_DIR=$(dirname "$SCRIPT")
-RARCH_DIR="$BASE_DIR/dist"
-RARCH_DIST_DIR="$RARCH_DIR/windows"
-
-if [ -z "$JOBS" ]; then
-   JOBS=4
-fi
-
-die()
-{
-   echo $1
-   #exit 1
-}
-
-if [ "$HOST_CC" ]; then
-   CC="${HOST_CC}-gcc"
-   CXX="${HOST_CC}-g++"
-   STRIP="${HOST_CC}-strip"
-fi
-
-if [ -z "$MAKE" ]; then
-   if [ "$(expr substr $(uname -s) 1 7)" == "MINGW32" ]; then
-      MAKE=mingw32-make
-   else
-      MAKE=make
-   fi
-fi
-
-if [ -z "$CC" ]; then
-   if [ "$(expr substr $(uname -s) 1 7)" == "MINGW32" ]; then
-      CC=mingw32-gcc
-   else
-      CC=gcc
-   fi
-fi
-
-if [ -z "$CXX" ]; then
-   if [ "$(expr substr $(uname -s) 1 7)" == "MINGW32" ]; then
-      CXX=mingw32-g++
-   else
-      CXX=g++
-   fi
-fi
-
-build_libretro_bsnes()
-{
-   if [ -d "libretro-bsnes/perf" ]; then
-      echo "=== Building bSNES performance ==="
-      cd libretro-bsnes/perf/higan
-      rm -f obj/*.o
-      rm -f out/*.dll
-      $MAKE platform=win compiler="$CC" ui=target-libretro profile=performance -j$JOBS clean || die "Failed to clean bSNES performance core"
-      $MAKE platform=win compiler="$CC" ui=target-libretro profile=performance -j$JOBS || die "Failed to build bSNES performance core"
-      cp -f out/retro.dll "$RARCH_DIST_DIR"/libretro-092-bsnes-performance.dll
-      cd ../../..
-   else
-      echo "bSNES performance not fetched, skipping ..."
-   fi
-
-   if [ -d "libretro-bsnes/balanced" ]; then
-      echo "=== Building bSNES balanced ==="
-      cd libretro-bsnes/balanced/higan
-      rm -f obj/*.o
-      rm -f out/*.dll
-      $MAKE platform=win compiler="$CC" ui=target-libretro profile=balanced -j$JOBS clean || die "Failed to clean bSNES balanced core"
-      $MAKE platform=win compiler="$CC" ui=target-libretro profile=balanced -j$JOBS || die "Failed to build bSNES balanced core"
-      cp -f out/retro.dll "$RARCH_DIST_DIR"/libretro-092-bsnes-balanced.dll
-      cd ../../..
-   else
-      echo "bSNES compat not fetched, skipping ..."
-   fi
-
-   if [ -d "libretro-bsnes" ]; then
-      echo "=== Building bSNES accuracy ==="
-      cd libretro-bsnes/higan
-      rm -f obj/*.o
-      rm -f out/*.dll
-      $MAKE platform=win compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS clean || die "Failed to clean bSNES accuracy core"
-      $MAKE platform=win compiler="$CC" ui=target-libretro profile=accuracy -j$JOBS || die "Failed to build bSNES accuracy core"
-      cp -f out/retro.dll "$RARCH_DIST_DIR"/libretro-092-bsnes-accuracy.dll
-      cd ../..
-   fi
-}
-
-build_libretro_mednafen()
-{
-   if [ -d "libretro-mednafen" ]; then
-      echo "=== Building Mednafen ==="
-      cd libretro-mednafen
-
-      cd psx
-      $MAKE core=psx platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean mednafen/psx"
-      $MAKE core=psx platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build mednafen/psx"
-      cp retro.dll "$RARCH_DIST_DIR"/libretro-0928-mednafen-psx.dll
-      "$STRIP" ../libretro-0928-mednafen-psx.dll
-      cd ..
-
-      cd pce-fast
-      $MAKE core=pce-fast platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean mednafen/pce-fast"
-      $MAKE core=pce-fast platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build mednafen/pce-fast"
-      cp retro.dll "$RARCH_DIST_DIR"/libretro-0928-mednafen-pce-fast.dll
-      "$STRIP" "$RARCH_DIST_DIR"/libretro-0928-mednafen-pce-fast.dll
-      cd ..
-
-      cd wswan
-      $MAKE core=wswan platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean mednafen/wswan"
-      $MAKE core=wswan platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build mednafen/wswan"
-      cp retro.dll "$RARCH_DIST_DIR"/libretro-0928-mednafen-wswan.dll
-      "$STRIP" "$RARCH_DIST_DIR"/libretro-0928-mednafen-wswan.dll
-      cd ..
-
-      cd ..
-   else
-      echo "Mednafen not fetched, skipping ..."
-   fi
-}
-
-build_libretro_s9x()
-{
-   if [ -d "libretro-s9x" ]; then
-      echo "=== Building SNES9x ==="
-      cd libretro-s9x/libretro
-      $MAKE CC=$CC CXX=$CXX platform=win -j$JOBS clean || die "Failed to clean SNES9x"
-      $MAKE CC=$CC CXX=$CXX platform=win -j$JOBS || die "Failed to build SNES9x"
-      cp libretro.dll "$RARCH_DIST_DIR"/libretro-git-snes9x.dll
-      cd ../..
-   else
-      echo "SNES9x not fetched, skipping ..."
-   fi
-}
-
-build_libretro_s9x_next()
-{
-   if [ -d "libretro-s9x-next" ]; then
-      echo "=== Building SNES9x-Next ==="
-      cd libretro-s9x-next/
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS clean || die "Failed to clean SNES9x-Next"
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS || die "Failed to build SNES9x-Next"
-      cp snes9x_next_retro.dll "$RARCH_DIST_DIR"/libretro-git-snes9x-next.dll
-      cd ..
-   else
-      echo "SNES9x-Next not fetched, skipping ..."
-   fi
-}
-
-build_libretro_genplus()
-{
-   if [ -d "libretro-genplus" ]; then
-      echo "=== Building Genplus GX ==="
-      cd libretro-genplus/
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS clean || die "Failed to clean Genplus GX"
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS || die "Failed to build Genplus GX"
-      cp genesis_plus_gx_retro.dll "$RARCH_DIST_DIR"/libretro-git-genplus.dll
-      cd ..
-   else
-      echo "Genplus GX not fetched, skipping ..."
-   fi
-}
-
-build_libretro_fba()
-{
-   if [ -d "libretro-fba" ]; then
-      echo "=== Building Final Burn Alpha ==="
-      cd libretro-fba/svn-current/trunk
-      $MAKE CC=$CC CXX=$CXX platform=win -f makefile.libretro -j$JOBS clean || die "Failed to clean Final Burn Alpha"
-      $MAKE CC=$CC CXX=$CXX platform=win -f makefile.libretro -j$JOBS || die "Failed to build Final Burn Alpha"
-      cp fb_alpha_retro.dll "$RARCH_DIST_DIR"/libretro-git-fba.dll
-      cd ../../..
-   else
-      echo "Final Burn Alpha not fetched, skipping ..."
-   fi
-}
-
-build_libretro_vba()
-{
-   if [ -d "libretro-vba" ]; then
-      echo "=== Building VBA-Next ==="
-      cd libretro-vba/
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS clean || die "Failed to clean VBA-Next"
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS || die "Failed to build VBA-Next"
-      cp vba_next_retro.dll "$RARCH_DIST_DIR"/libretro-git-vba.dll
-      cd ..
-   else
-      echo "VBA-Next not fetched, skipping ..."
-   fi
-}
-
-build_libretro_bnes()
-{
-   if [ -d "libretro-bnes" ]; then
-      echo "=== Building bNES ==="
-      cd libretro-bnes
-      mkdir -p obj
-      $MAKE CC=$CC CXX=$CXX platform=win -j$JOBS clean || die "Failed to clean bNES"
-      $MAKE CC=$CC CXX=$CXX platform=win -j$JOBS || die "Failed to build bNES"
-      cp retro.dll "$RARCH_DIST_DIR"/libretro-git-bnes.dll
-      cd ..
-   else
-      echo "bNES not fetched, skipping ..."
-   fi
-}
-
-build_libretro_fceu()
-{
-   if [ -d "libretro-fceu" ]; then
-      echo "=== Building FCEU ==="
-      cd libretro-fceu
-      $MAKE CC=$CC CXX=$CXX platform=win -C fceumm-code -f Makefile.libretro -j$JOBS clean || die "Failed to clean FCEU"
-      $MAKE CC=$CC CXX=$CXX platform=win -C fceumm-code -f Makefile.libretro -j$JOBS || die "Failed to build FCEU"
-      cp fceumm-code/fceumm_retro.dll "$RARCH_DIST_DIR"/libretro-git-fceu.dll
-      cd ..
-   else
-      echo "FCEU not fetched, skipping ..."
-   fi
-}
-
-build_libretro_gambatte()
-{
-   if [ -d "libretro-gambatte" ]; then
-      echo "=== Building Gambatte ==="
-      cd libretro-gambatte/libgambatte
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS clean || die "Failed to clean Gambatte"
-      $MAKE CC=$CC CXX=$CXX platform=win -f Makefile.libretro -j$JOBS || die "Failed to build Gambatte"
-      cp gambatte_retro.dll "$RARCH_DIST_DIR"/libretro-git-gambatte.dll
-      cd ../..
-   else
-      echo "Gambatte not fetched, skipping ..."
-   fi
-}
-
-build_libretro_meteor()
-{
-   if [ -d "libretro-meteor" ]; then
-      echo "=== Building Meteor ==="
-      cd libretro-meteor/libretro
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean Meteor"
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build Meteor"
-      cp retro.dll "$RARCH_DIST_DIR"/libretro-git-meteor.dll
-      cd ../..
-   else
-      echo "Meteor not fetched, skipping ..."
-   fi
-}
-
-build_libretro_stella()
-{
-   if [ -d "libretro-stella" ]; then
-      echo "=== Building Stella ==="
-      cd libretro-stella
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean Stella"
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build Stella"
-      cp stella_retro.dll "$RARCH_DIST_DIR"/libretro-git-stella.dll
-      cd ../
-   else
-      echo "Stella not fetched, skipping ..."
-   fi
-}
-
-build_libretro_desmume()
-{
-   if [ -d "libretro-desmume" ]; then
-      echo "=== Building Desmume ==="
-      cd libretro-desmume
-      $MAKE platform=win CC=$CC CXX=$CXX -f Makefile.libretro -j$JOBS clean || die "Failed to clean Desmume"
-      $MAKE platform=win CC=$CC CXX=$CXX -f Makefile.libretro -j$JOBS || die "Failed to build Desmume"
-      cp retro.dll "$RARCH_DIST_DIR"/libretro-git-desmume.dll
-      cd ../
-   else
-      echo "Desmume not fetched, skipping ..."
-   fi
-}
-
-build_libretro_quicknes()
-{
-   if [ -d "libretro-quicknes" ]; then
-      echo "=== Building QuickNES ==="
-      cd libretro-quicknes/libretro
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean QuickNES"
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build QuickNES"
-      cp quicknes_retro.dll "$RARCH_DIST_DIR"/libretro-git-quicknes.dll
-      cd ../..
-   else
-      echo "QuickNES not fetched, skipping ..."
-   fi
-}
-
-build_libretro_nestopia()
-{
-   if [ -d "libretro-nestopia" ]; then
-      echo "=== Building Nestopia ==="
-      cd libretro-nestopia/libretro
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS clean || die "Failed to clean Nestopia"
-      $MAKE platform=win CC=$CC CXX=$CXX -j$JOBS || die "Failed to build Nestopia"
-      cp nestopia_retro.dll "$RARCH_DIST_DIR"/libretro-144-nestopia.dll
-      cd ../..
-   else
-      echo "Nestopia not fetched, skipping ..."
-   fi
-}
-
-mkdir -p "$RARCH_DIST_DIR"
-
-if [ $1 ]; then
-   $1
-else
-   build_libretro_bsnes
-   build_libretro_mednafen
-   build_libretro_s9x
-   build_libretro_s9x_next
-   build_libretro_genplus
-   build_libretro_fba
-   build_libretro_vba
-   build_libretro_bnes
-   build_libretro_fceu
-   build_libretro_gambatte
-   build_libretro_meteor
-   build_libretro_stella
-   build_libretro_desmume
-   build_libretro_quicknes
-   build_libretro_nestopia
-   build_libretro_modelviewer
-   build_libretro_scenewalker
-fi
diff --git a/libretro-build.sh b/libretro-build.sh
index 0d05c8b7..8d0c3ecd 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -19,6 +19,7 @@ elif [ "`echo $UNAME | grep -i MINGW`" ]; then
    FORMAT_EXT="dll"
    FORMAT_COMPILER_TARGET=win
    FORMAT_COMPILER_TARGET_ALT=win
+
 else
 # assume this is UNIX-based at least
    FORMAT_EXT="so"
@@ -51,7 +52,7 @@ SCRIPT=$(read_link "$0")
 echo "Script: $SCRIPT"
 BASE_DIR=$(dirname "$SCRIPT")
 RARCH_DIR="$BASE_DIR/dist"
-RARCH_DIST_DIR="$RARCH_DIR/pc"
+RARCH_DIST_DIR="$RARCH_DIR/pcwin"
 
 if [ -z "$JOBS" ]; then
    JOBS=4
@@ -91,8 +92,34 @@ elif [ $ARCH = armv7l ]; then
    ARMV7=true
 fi
 
+if [ "$HOST_CC" ]; then
+   CC="${HOST_CC}-gcc"
+   CXX="${HOST_CC}-g++"
+   STRIP="${HOST_CC}-strip"
+fi
+
+if [ -z "$MAKE" ]; then
+   if [ "$(expr substr $(uname -s) 1 7)" == "MINGW32" ]; then
+      MAKE=mingw32-make
+   else
+      MAKE=make
+   fi
+fi
+
 if [ -z "$CC" ]; then
-   CC=gcc
+   if [ "$(expr substr $(uname -s) 1 7)" == "MINGW32" ]; then
+      CC=mingw32-gcc
+   else
+      CC=gcc
+   fi
+fi
+
+if [ -z "$CXX" ]; then
+   if [ "$(expr substr $(uname -s) 1 7)" == "MINGW32" ]; then
+      CXX=mingw32-g++
+   else
+      CXX=g++
+   fi
 fi
 
 mkdir -p "$RARCH_DIST_DIR"
@@ -100,7 +127,6 @@ mkdir -p "$RARCH_DIST_DIR"
 if [ $1 ]; then
    $1
 else
-   build_libretro_desmume
    build_libretro_bsnes
    build_libretro_mednafen
    build_libretro_mednafen_gba
@@ -129,4 +155,7 @@ if [ -z $BUILD_LIBRETRO_GL ]; then
    build_libretro_modelviewer
    build_libretro_scenewalker
 fi
+if [ $FORMAT_COMPILER_TARGET != "win" ]; then
+   build_libretro_desmume
+fi
 fi