From 1ce6a85ea6cf4ad40f422824238561b4eaf3c126 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 13 Jul 2013 22:09:41 +0200
Subject: [PATCH] Override FORMAT_COMPILER_TARGET for optimized ARM build flags

---
 libretro-build-common.sh | 42 ++++++++++++++--------------------------
 libretro-config.sh       | 12 ++++++++++--
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 9ea62a08..a6413eac 100644
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -14,32 +14,32 @@ fi
 
 echo "Compiler: $COMPILER"
 
-export ARMPLATFORM=$ARMPLATFORM-armv
+export FORMAT_COMPILER_TARGET=armv
 
 if [ "$ARM_NEON" ]; then
 echo "=== ARM NEON opts enabled... ==="
-export ARMPLATFORM=$ARMPLATFORM-neon
-echo $ARMPLATFORM
+export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-neon
+echo $FORMAT_COMPILER_TARGET
 fi
 if [ "$CORTEX_A8" ]; then
 echo "=== Cortex A8 opts enabled... ==="
-export ARMPLATFORM=$ARMPLATFORM-cortexa8
-echo $ARMPLATFORM
+export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-cortexa8
+echo $FORMAT_COMPILER_TARGET
 fi
 if [ "$CORTEX_A9" ]; then
 echo "=== Cortex A9 opts enabled... ==="
-export ARMPLATFORM=$ARMPLATFORM-cortexa9
-echo $ARMPLATFORM
+export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-cortexa9
+echo $FORMAT_COMPILER_TARGET
 fi
 if [ "$ARM_HARDFLOAT" ]; then
 echo "=== ARM hardfloat ABI enabled... ==="
-export ARMPLATFORM=$ARMPLATFORM-hardfloat
-echo $ARMPLATFORM
+export FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET-hardfloat
+echo $FORMAT_COMPILER_TARGET
 fi
 if [ "$ARM_SOFTFLOAT" ]; then
 echo "=== ARM softfloat ABI enabled... ==="
-export ARMPLATFORM=ARMPLATFORM-softfloat
-echo $ARMPLATFORM
+export FORMAT_COMPILER_TARGET=FORMAT_COMPILER_TARGET-softfloat
+echo $FORMAT_COMPILER_TARGET
 fi
 
 build_libretro_fba_full()
@@ -64,14 +64,8 @@ build_libretro_pcsx_rearmed()
    if [ -d "libretro-pcsx-rearmed" ]; then
       echo "=== Building PCSX ReARMed ==="
       cd libretro-pcsx-rearmed
-      if [ "$ARMV7" = true ]; then
-         echo "=== Building PCSX ReARMed (ARMV7) ==="
-         ${MAKE} -f Makefile.libretro platform=$ARMPLATFORM -j$JOBS clean || die "Failed to clean PCSX ReARMed"
-         ${MAKE} -f Makefile.libretro platform=$ARMPLATFORM -j$JOBS || die "Failed to build PCSX ReARMed"
-      else
-         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean PCSX ReARMed"
-         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX ReARMed"
-      fi
+      ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean PCSX ReARMed"
+      ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX ReARMed"
       cp pcsx_rearmed_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "PCSX ReARMed not fetched, skipping ..."
@@ -511,14 +505,8 @@ build_libretro_picodrive()
    if [ -d "libretro-picodrive" ]; then
       echo "=== Building Picodrive ==="
       cd libretro-picodrive
-      if [ "$ARMV7" = true ]; then
-         echo "=== Building Picodrive (ARMv7) ==="
-         ${MAKE} -f Makefile.libretro platform=$ARMPLATFORM-armasm -j$JOBS clean || die "Failed to clean Picodrive"
-         ${MAKE} -f Makefile.libretro platform=$ARMPLATFORM-armasm -j$JOBS || die "Failed to build Picodrive"
-      else
-         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean Picodrive"
-         ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX Picodrive"
-      fi
+      ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS clean || die "Failed to clean Picodrive"
+      ${MAKE} -f Makefile.libretro platform=$FORMAT_COMPILER_TARGET $COMPILER -j$JOBS || die "Failed to build PCSX Picodrive"
       cp picodrive_libretro$FORMAT.$FORMAT_EXT "$RARCH_DIST_DIR"
    else
       echo "Picodrive not fetched, skipping ..."
diff --git a/libretro-config.sh b/libretro-config.sh
index 4effcbe6..571feda4 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -13,8 +13,6 @@ fi
 #if uncommented, will fetch repos with read+write access. Useful for committers
 #export WRITERIGHTS=1
 
-#if uncommented, will build libretro GL cores as well. Doesn't need to be defined for mobile platforms
-#export BUILD_LIBRETRO_GL=1
 
 #if uncommented, will build experimental cores as well which are not yet fit for release.
 #export BUILD_EXPERIMENTAL=1
@@ -37,3 +35,13 @@ export ARMPLATFORM=
 
 #if uncommented, will build cores with ARM NEON support (ARMv7+ only)
 #export ARM_NEON=1
+
+#OPENGL DEFINES
+#--------------
+
+#if uncommented, will build libretro GL cores. Ignored for mobile platforms
+export BUILD_LIBRETRO_GL=1
+
+#if uncommented, will build cores with OpenGL ES 2 support. Not needed
+#for platform-specific cores - only for generic core builds
+#export ENABLE_GLES=1