From 0a66a64d74439e79d6b594ca22df81f659d4ccf9 Mon Sep 17 00:00:00 2001
From: tomgar <tomgpdev at@ gmail dot. com>
Date: Sun, 5 Oct 2014 12:09:13 +0100
Subject: [PATCH] Alternative fix to issue #114: in the c1f950767e20 commit, I
 assumed some things which weren't right. This commit just makes the minimal
 changes to let o2em compile successfully.

---
 libretro-build-common.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index a174e350..cb7d041a 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -24,6 +24,8 @@ echo "Compiler: ${COMPILER}"
 
 echo "${FORMAT_COMPILER_TARGET}"
 echo "${FORMAT_COMPILER_TARGET_ALT}"
+RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
+RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT
 
 check_opengl() {
    if [ "${BUILD_LIBRETRO_GL}" ]; then
@@ -41,6 +43,11 @@ check_opengl() {
    fi
 }
 
+reset_compiler_targets() {
+   export FORMAT_COMPILER_TARGET=$RESET_FORMAT_COMPILER_TARGET
+   export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT
+}
+
 build_libretro_pcsx_rearmed_interpreter() {
    cd "${BASE_DIR}"
    if [ -d 'libretro-pcsx-rearmed' ]; then
@@ -281,15 +288,13 @@ build_libretro_fb_alpha() {
 build_libretro_ffmpeg() {
    check_opengl
    build_libretro_generic_makefile "ffmpeg" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
-   # reset check_opengl
-   export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
+   reset_compiler_targets
 }
 
 build_libretro_3dengine() {
    check_opengl
    build_libretro_generic_makefile "3dengine" "." "Makefile" ${FORMAT_COMPILER_TARGET}
-   # reset check_opengl
-   export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
+   reset_compiler_targets
 }
 
 build_libretro_scummvm() {
@@ -299,8 +304,7 @@ build_libretro_scummvm() {
 build_libretro_ppsspp() {
    check_opengl
    build_libretro_generic_makefile "ppsspp" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
-   # reset check_opengl
-   export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
+   reset_compiler_targets
 }
 
 
@@ -543,8 +547,7 @@ build_libretro_mupen64() {
    else
       echo 'Mupen64 Plus not fetched, skipping ...'
    fi
-   # reset check_opengl
-   export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
+   reset_compiler_targets
 }
 
 create_dist_dir() {