From 90470b1bb4e9c151b7655dee75f2206b24329c5c Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 24 Dec 2014 21:27:42 -0500 Subject: [PATCH] add r9 recipe for mupen64 --- libretro-buildbot-recipe.sh | 2 +- recipes/recipes-android | 2 +- recipes/recipes-android-r9 | 1 + recipes/recipes-android-r9.conf | 8 ++++++++ recipes/recipes-android.conf | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 recipes/recipes-android-r9 create mode 100644 recipes/recipes-android-r9.conf diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 4726828c..f355cd28 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -785,7 +785,7 @@ then fi -if [ "${PLATFORM}" == "android" ]; +if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then while read line; do diff --git a/recipes/recipes-android b/recipes/recipes-android index 63093604..fdd0f720 100644 --- a/recipes/recipes-android +++ b/recipes/recipes-android @@ -22,7 +22,7 @@ mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/bee mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC_JNI Makefile jni mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC_JNI Makefile jni meteor libretro-meteor https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni +mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT NO GENERIC_JNI Makefile libretro/jni nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC_JNI Makefile libretro/jni nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC_JNI Makefile jni o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC_JNI Makefile jni diff --git a/recipes/recipes-android-r9 b/recipes/recipes-android-r9 new file mode 100644 index 00000000..46c8ac3c --- /dev/null +++ b/recipes/recipes-android-r9 @@ -0,0 +1 @@ +mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni diff --git a/recipes/recipes-android-r9.conf b/recipes/recipes-android-r9.conf new file mode 100644 index 00000000..94958467 --- /dev/null +++ b/recipes/recipes-android-r9.conf @@ -0,0 +1,8 @@ +ANDROID_HOME /opt/android-sdk +NDK_ROOT /opt/android-ndk-r9 +ANDROID_NDK /opt/android-ndk-r9 +PATH /opt/android-ndk-r9:/opt/android-sdk/tools +PLATFORM android +platform android +NDK ndk-build +RA NO diff --git a/recipes/recipes-android.conf b/recipes/recipes-android.conf index c36cd1b4..3dc9e659 100644 --- a/recipes/recipes-android.conf +++ b/recipes/recipes-android.conf @@ -6,3 +6,4 @@ PLATFORM android platform android MAKE make NDK ndk-build +RA YES