From efb86929d8c9d0a0eca92ecb831227f7d13c07b6 Mon Sep 17 00:00:00 2001 From: jdgleaver Date: Wed, 9 May 2018 16:07:12 +0100 Subject: [PATCH] - Fix broken scummvm github link in recipes/android/cores-android-jni - Add scummvm to libretro-build-android-mk.sh --- libretro-build-android-mk.sh | 8 +++++++- recipes/android/cores-android-jni | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh index acb8a5ab..0543336b 100644 --- a/libretro-build-android-mk.sh +++ b/libretro-build-android-mk.sh @@ -164,7 +164,8 @@ WANT_CORES=" \ xrick \ pocketcdg \ crocods \ - puae" + puae \ + scummvm" fi for core in $WANT_CORES; do @@ -187,6 +188,11 @@ for core in $WANT_CORES; do path="target-libretro/jni" append="_$core" fi + + if [ $core = "scummvm" ]; then + path="backends/platform/libretro/build/jni" + fi + build_libretro_generic_makefile $core $path $append build_libretro_generic_makefile_armv7neon $core $path $append done diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni index bbb112c3..b0a94dd8 100644 --- a/recipes/android/cores-android-jni +++ b/recipes/android/cores-android-jni @@ -75,7 +75,7 @@ px68k libretro-px68k https://github.com/libretro/px68k-libretro.git master YES G quicknes libretro-quicknes https://github.com/libretro/QuickNES_Core.git master YES GENERIC_JNI Makefile jni reminiscence libretro-reminiscence https://github.com/libretro/REminiscence.git master YES GENERIC_JNI Makefile jni sameboy libretro-sameboy https://github.com/libretro/SameBoy.git buildbot YES GENERIC_JNI Makefile libretro/jni -scummvm libretro-scummvm https://github.com/webgeek1234/scummvm.git master YES GENERIC_JNI Makefile backends/platform/libretro/build/jni +scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC_JNI Makefile backends/platform/libretro/build/jni snes9x libretro-snes9x https://github.com/libretro/snes9x.git master YES GENERIC_JNI Makefile libretro/jni snes9x2002 libretro-snes9x2002 https://github.com/libretro/snes9x2002.git master YES GENERIC_JNI Makefile jni snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git master YES GENERIC_JNI Makefile jni