From 6ee5866bafaaae16e1810bdd1008d6173c9932f9 Mon Sep 17 00:00:00 2001 From: l3iggs Date: Wed, 20 Aug 2014 11:03:40 -0700 Subject: [PATCH 1/2] (Android) add API level variables for RetroArch build --- libretro-config.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libretro-config.sh b/libretro-config.sh index 30e703be..36b8ca1a 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -120,3 +120,9 @@ export NDK_GL_HEADER_VER=android-18 # android version target if GLES is not in use export NDK_NO_GL_HEADER_VER=android-9 + +# Retroarch target android API level +export RA_ANDROID_API=android-18 + +# Retroarch minimum API level (defines low end android version compatability) +export RA_ANDROID_MIN_API=android-9 From d9206ce6a9155d92f2b8de6a508ca76552f277a2 Mon Sep 17 00:00:00 2001 From: l3iggs Date: Wed, 20 Aug 2014 11:14:33 -0700 Subject: [PATCH 2/2] Move user defines down Including the user config script should come last to allow for the possibility of redefining/undefining any default variable --- libretro-config.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libretro-config.sh b/libretro-config.sh index 36b8ca1a..d4f409e2 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -53,19 +53,6 @@ esac export FORMAT_COMPILER_TARGET_ALT="$FORMAT_COMPILER_TARGET" -#USER DEFINES -#------------ -#These options should be defined inside your own -#local libretro-config-user.sh file rather than here. -#The following below is just a sample. - -if [ -f "libretro-config-user.sh" ]; then -. ./libretro-config-user.sh -else -# Sane defaults -export BUILD_LIBRETRO_GL=1 -fi - #if uncommented, will fetch repos with read+write access. Useful for committers #export WRITERIGHTS=1 @@ -126,3 +113,16 @@ export RA_ANDROID_API=android-18 # Retroarch minimum API level (defines low end android version compatability) export RA_ANDROID_MIN_API=android-9 + +#USER DEFINES +#------------ +#These options should be defined inside your own +#local libretro-config-user.sh file rather than here. +#The following below is just a sample. + +if [ -f "libretro-config-user.sh" ]; then +. ./libretro-config-user.sh +else +# Sane defaults +export BUILD_LIBRETRO_GL=1 +fi