From 7dd81ab1f3ad2155b290faaaeddfa89c43e4fcaa Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Thu, 22 Aug 2013 10:06:09 +0200
Subject: [PATCH] Update bSNES build.

---
 libretro-build-common.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index fd7c612e..8544c5cb 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -456,10 +456,10 @@ build_libretro_bsnes()
    cd "$BASE_DIR"
    if [ -d "libretro-bsnes/perf" ]; then
       echo "=== Building bSNES performance ==="
-      cd libretro-bsnes/perf/higan
+      cd libretro-bsnes/perf
       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 || die "Failed to build bSNES performance core"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CXX" ui=target-libretro profile=performance -j$JOBS || die "Failed to build bSNES performance core"
       cp -f out/bsnes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_performance.${FORMAT_EXT}
    else
       echo "bSNES performance not fetched, skipping ..."
@@ -468,10 +468,10 @@ build_libretro_bsnes()
    cd "$BASE_DIR"
    if [ -d "libretro-bsnes/balanced" ]; then
       echo "=== Building bSNES balanced ==="
-      cd libretro-bsnes/balanced/higan
+      cd libretro-bsnes/balanced
       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 || die "Failed to build bSNES balanced core"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CXX" ui=target-libretro profile=balanced -j$JOBS || die "Failed to build bSNES balanced core"
       cp -f out/bsnes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_balanced.${FORMAT_EXT}
    else
       echo "bSNES compat not fetched, skipping ..."
@@ -480,10 +480,10 @@ build_libretro_bsnes()
    cd "$BASE_DIR"
    if [ -d "libretro-bsnes" ]; then
       echo "=== Building bSNES accuracy ==="
-      cd libretro-bsnes/higan
+      cd libretro-bsnes
       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 || die "Failed to build bSNES accuracy core"
+      ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} compiler="$CXX" ui=target-libretro profile=accuracy -j$JOBS || die "Failed to build bSNES accuracy core"
       cp -f out/bsnes_libretro${FORMAT}.${FORMAT_EXT} "$RARCH_DIST_DIR"/bsnes_libretro_accuracy.${FORMAT_EXT}
    fi
 }