From b177185b0eb395e0061515f59e26b92c8bfb8fdb Mon Sep 17 00:00:00 2001
From: Darren <dalton@stevens.edu>
Date: Tue, 18 Sep 2012 04:42:21 -0400
Subject: [PATCH] (Pandora) factored out LD_PRELOAD since we need it for some
 cores too.

---
 pandora/scripts/env-vars.sh          | 4 ++++
 pandora/scripts/retroarch-phoenix.sh | 4 +---
 pandora/scripts/retroarch.sh         | 5 ++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pandora/scripts/env-vars.sh b/pandora/scripts/env-vars.sh
index 01d2250d0b..d80a46b155 100755
--- a/pandora/scripts/env-vars.sh
+++ b/pandora/scripts/env-vars.sh
@@ -16,3 +16,7 @@ export SDL_AUDIODRIVER="alsa"
 # integral scaling
 export SDL_OMAP_LAYER_SIZE="pixelperfect"
 
+# load the libstdc++ from gcc-4.7 because phoenix and some cores don't build in anything less
+# preload latest notaz SDL that knows what "pixelperfect" is
+export LD_PRELOAD=${HOME}/lib/libstdc++.so.6:$HOME/lib/libSDL-1.2.so.0.11.3
+
diff --git a/pandora/scripts/retroarch-phoenix.sh b/pandora/scripts/retroarch-phoenix.sh
index cb88f6340a..8fb49dc8af 100755
--- a/pandora/scripts/retroarch-phoenix.sh
+++ b/pandora/scripts/retroarch-phoenix.sh
@@ -2,7 +2,5 @@
 
 source "$(dirname $0)/env-vars.sh"
 
-# load the libstdc++ from gcc-4.7 because phoenix doesn't build in anything less
-# preload latest notaz SDL that knows what "pixelperfect" is
-exec env LD_PRELOAD=${HOME}/lib/libstdc++.so.6:$HOME/lib/libSDL-1.2.so.0.11.3 retroarch-phoenix "${@}"
+exec retroarch-phoenix "${@}"
 
diff --git a/pandora/scripts/retroarch.sh b/pandora/scripts/retroarch.sh
index 1f0f9d9413..eee64c095a 100755
--- a/pandora/scripts/retroarch.sh
+++ b/pandora/scripts/retroarch.sh
@@ -16,7 +16,7 @@ case "${BACKEND}" in
 	libretro-fceu*.so | libretro-bnes.so)
 		FILTER='NES (*.nes)|*.nes'
 		;;
-	libretro-pocketsnes.so | libretro-snes9x*.so)
+	libretro-pocketsnes.so | libretro-snes9x*.so | libretro-bsnes*.so)
 		FILTER='SNES (*.sfc)|*.sfc'
 		;;
 	libretro-gambatte.so)
@@ -52,6 +52,5 @@ ROM=$(zenity --file-selection --file-filter="${FILTER}" "${LASTROM}")
 
 echo "${ROM}" > "${BACKEND}-lastrom.txt"
 
-# latest notaz SDL that knows what "pixelperfect" is
-exec env LD_PRELOAD=${HOME}/lib/libSDL-1.2.so.0.11.3 retroarch "${ROM}" -L "${HOME}/lib/${BACKEND}" "${@}"
+exec retroarch "${ROM}" -L "${HOME}/lib/${BACKEND}" "${@}"