From 1868b1f0f1b47f8caed379b5c763088ac328262b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 31 Jul 2015 05:09:54 +0200
Subject: [PATCH] Cleanups

---
 libretro-build.sh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/libretro-build.sh b/libretro-build.sh
index 809c5d92..13371e68 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -88,11 +88,20 @@ echo "STRIP = $STRIP"
 
 . "$BASE_DIR/libretro-build-common.sh"
 
+# These are C++11 cores - not supported by these targets
+
+build_default_cores_cpp11() {
+	libretro_build_core dinothawr
+	libretro_build_core stonesoup
+	libretro_build_core bsnes
+	libretro_build_core bsnes_mercury
+	libretro_build_core mame
+}
+
+# These build everywhere libretro-build.sh works
+# (They also use rules builds, which will help later)
+
 build_default_cores() {
-
-	# These build everywhere libretro-build.sh works
-	# (They also use rules builds, which will help later)
-
 	libretro_build_core 2048
 	libretro_build_core bluemsx
 	libretro_build_core catsfc
@@ -117,9 +126,6 @@ build_default_cores() {
 	libretro_build_core vecx
 	libretro_build_core virtualjaguar
 
-	# Nothing past here supports theos
-	[ "$platform" = "theos_ios" ] && return
-
 	libretro_build_core bsnes_cplusplus98
 
 	libretro_build_core emux
@@ -170,13 +176,8 @@ build_default_cores() {
 		libretro_build_core yabause
 	fi
 
-	if [ $platform != "qnx" && [ $platform != "ps3" ] && [ $platform != "sncps3" ]; then
-		# These are C++11 cores - not supported by these targets
-		libretro_build_core dinothawr
-		libretro_build_core stonesoup
-		libretro_build_core bsnes
-		libretro_build_core bsnes_mercury
-		libretro_build_core mame
+	if [ $platform != "qnx" ] && [ $platform != "ps3" ] && [ $platform != "sncps3" ]; then
+		build_default_cores_cpp11
 	fi
 
 	if [ $platform != "win" ]; then
@@ -186,6 +187,7 @@ build_default_cores() {
 	fi
 
 	if [ $platform != "ios" ] && [ $platform != "qnx" ]; then
+		# Would need ffmpeg libraries baked in
 		libretro_build_core ffmpeg
 		libretro_build_core ppsspp