From f183e3cb70e495dd6e2ef651c870f09b78a4e0af Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Sat, 31 Mar 2018 22:15:38 -0500 Subject: [PATCH] Build mupen64plus android using jni Armv7 and arm64 build correctly, x86 does not. But x86 was not built before anyways. --- recipes/android/cores-android-armv7-ndk | 2 -- recipes/android/cores-android-jni | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/android/cores-android-armv7-ndk b/recipes/android/cores-android-armv7-ndk index d7b119c5..2d880d79 100644 --- a/recipes/android/cores-android-armv7-ndk +++ b/recipes/android/cores-android-armv7-ndk @@ -1,4 +1,2 @@ -mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC Makefile . -mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC Makefile . platform=android-armv7-gles3 mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git master YES GENERIC Makefile . VRENDER=soft PTR64=0 CC=arm-linux-androideabi-gcc CXX=arm-linux-androideabi-g++ LD=arm-linux-androideabi-g++ platform=android emulator scummvm libretro-scummvm https://github.com/libretro/scummvm.git master YES GENERIC Makefile backends/platform/libretro/build diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni index 002f7ea6..58361a42 100644 --- a/recipes/android/cores-android-jni +++ b/recipes/android/cores-android-jni @@ -44,6 +44,8 @@ mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-li melonds libretro-melonds https://github.com/libretro/melonDS.git master YES GENERIC_JNI Makefile jni meteor libretro-meteor https://github.com/libretro/meteor-libretro.git master YES GENERIC_JNI Makefile libretro/jni mrboom libretro-mrboom https://github.com/libretro/mrboom-libretro.git master YES GENERIC_JNI Makefile jni +mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni +mupen64plus_gles3 libretro-mupen64plus-gles3 https://github.com/libretro/mupen64plus-libretro.git master YES GENERIC_JNI Makefile libretro/jni GLES3=1 APP_PLATFORM=android-18 nekop2 libretro-nekop2 https://github.com/libretro/libretro-meowPC98.git master YES GENERIC_JNI Makefile.libretro libretro/jni nestopia libretro-nestopia https://github.com/libretro/nestopia.git master YES GENERIC_JNI Makefile libretro/jni np2kai libretro-np2kai https://github.com/AZO234/NP2kai.git master YES GENERIC_JNI Makefile.libretro jni