From d2a323eabcff5854534497063793dd6345130f46 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sat, 28 Apr 2012 09:22:49 +0200
Subject: [PATCH] Update build to use gitorious bsnes repo.

---
 libretro-build-win32.sh | 28 ++++++++++++++++------------
 libretro-build.sh       | 28 ++++++++++++++++------------
 libretro-fetch.sh       |  4 ++--
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/libretro-build-win32.sh b/libretro-build-win32.sh
index 4185f4cb..c956b884 100755
--- a/libretro-build-win32.sh
+++ b/libretro-build-win32.sh
@@ -6,34 +6,38 @@ die()
    #exit 1
 }
 
+if [ -z "$CC" ]; then
+   CC=gcc
+fi
+
 build_libretro_bsnes()
 {
    if [ -d "libretro-bsnes/perf" ]; then
       echo "=== Building bSNES performance ==="
-      cd libretro-bsnes/perf
-      make CC=$CC CXX=$CXX platform=win profile=performance -j4 || die "Failed to build bSNES performance core"
-      cp -f out/retro.dll ../libretro-085-bsnes-performance.dll
-      cd ../..
+      cd libretro-bsnes/perf/bsnes
+      make platform=win compiler="$CC" ui=target-libretro profile=performance -j4 || die "Failed to build bSNES performance core"
+      cp -f out/retro.dll ../../libretro-bsnes-performance.dll
+      cd ../../..
    else
       echo "bSNES performance not fetched, skipping ..."
    fi
 
    if [ -d "libretro-bsnes/compat" ]; then
       echo "=== Building bSNES compatibility ==="
-      cd libretro-bsnes/compat
-      make CC=$CC CXX=$CXX platform=win profile=compatibility -j4 || die "Failed to build bSNES compatibility core"
-      cp -f out/retro.dll ../libretro-085-bsnes-compat.dll
-      cd ../..
+      cd libretro-bsnes/compat/bsnes
+      make platform=win compiler="$CC" ui=target-libretro profile=compatibility -j4 || die "Failed to build bSNES compatibility core"
+      cp -f out/retro.dll ../../libretro-bsnes-compat.dll
+      cd ../../..
    else
       echo "bSNES compat not fetched, skipping ..."
    fi
 
    if [ -d "libretro-bsnes" ]; then
       echo "=== Building bSNES accuracy ==="
-      cd libretro-bsnes
-      make CC=$CC CXX=$CXX platform=win profile=accuracy -j4 || die "Failed to build bSNES accuracy core"
-      cp -f out/retro.dll libretro-085-bsnes-accuracy.dll
-      cd ..
+      cd libretro-bsnes/bsnes
+      make platform=win compiler="$CC" ui=target-libretro profile=accuracy -j4 || die "Failed to build bSNES accuracy core"
+      cp -f out/retro.dll ../libretro-bsnes-accuracy.dll
+      cd ../..
    fi
 }
 
diff --git a/libretro-build.sh b/libretro-build.sh
index e5d3d535..9c906916 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -8,32 +8,36 @@ die()
 
 build_libretro_bsnes()
 {
+   if [ -z "$CC" ]; then
+      CC=gcc
+   fi
+
    if [ -d "libretro-bsnes/perf" ]; then
       echo "=== Building bSNES performance ==="
-      cd libretro-bsnes/perf
-      make profile=performance -j4 || die "Failed to build bSNES performance core"
-      cp -f out/libretro.so ../libretro-bsnes-performance.so
-      cd ../..
+      cd libretro-bsnes/perf/bsnes
+      make compiler="$CC" ui=target-libretro profile=performance -j4 || die "Failed to build bSNES performance core"
+      cp -f out/libretro.so ../../libretro-bsnes-performance.so
+      cd ../../..
    else
       echo "bSNES performance not fetched, skipping ..."
    fi
 
    if [ -d "libretro-bsnes/compat" ]; then
       echo "=== Building bSNES compatibility ==="
-      cd libretro-bsnes/compat
-      make profile=compatibility -j4 || die "Failed to build bSNES compatibility core"
-      cp -f out/libretro.so ../libretro-bsnes-compat.so
-      cd ../..
+      cd libretro-bsnes/compat/bsnes
+      make compiler="$CC" ui=target-libretro profile=compatibility -j4 || die "Failed to build bSNES compatibility core"
+      cp -f out/libretro.so ../../libretro-bsnes-compat.so
+      cd ../../..
    else
       echo "bSNES compat not fetched, skipping ..."
    fi
 
    if [ -d "libretro-bsnes" ]; then
       echo "=== Building bSNES accuracy ==="
-      cd libretro-bsnes
-      make profile=accuracy -j4 || die "Failed to build bSNES accuracy core"
-      cp -f out/libretro.so libretro-bsnes-accuracy.so
-      cd ..
+      cd libretro-bsnes/bsnes
+      make compiler="$CC" ui=target-libretro profile=accuracy -j4 || die "Failed to build bSNES accuracy core"
+      cp -f out/libretro.so ../libretro-bsnes-accuracy.so
+      cd ../..
    fi
 }
 
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 8071327e..12f18f52 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -10,7 +10,7 @@ fetch_project_bsnes()
       git pull
       cd ..
    else
-      git clone "$1" "$2"
+      git clone $1 "$2"
    fi
 
    if [ -d "$2" ]; then
@@ -51,7 +51,7 @@ fetch_project()
 
 REPO_BASE="git://github.com"
 
-fetch_project_bsnes "$REPO_BASE/Themaister/bsnes-libretro.git" "libretro-bsnes" "libretro/bSNES"
+fetch_project_bsnes "git://gitorious.org/bsnes/bsnes.git --branch libretro" "libretro-bsnes" "libretro/bSNES"
 fetch_project "$REPO_BASE/snes9xgit/snes9x.git" "libretro-s9x" "libretro/SNES9x"
 fetch_project "$REPO_BASE/twinaphex/snes9x-next.git" "libretro-s9x-next" "libretro/SNES9x-Next"
 fetch_project "$REPO_BASE/twinaphex/genesis-next.git" "libretro-genplus" "libretro/Genplus GX"