From 50e23614f1e4f6672c7207ce74077ca1453b0a70 Mon Sep 17 00:00:00 2001 From: fr500 Date: Fri, 20 Nov 2015 17:15:54 -0500 Subject: [PATCH] revert the changes to the mame toolchains --- recipes/android/cores-android-armv7-ndk | 3 --- recipes/android/cores-android-armv7-ndk-mame | 4 +++- recipes/android/cores-android-armv7-ndk-mame.conf | 6 +++--- recipes/android/cores-android-armv7-ndk.conf | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/recipes/android/cores-android-armv7-ndk b/recipes/android/cores-android-armv7-ndk index d612e5bc..ff18501e 100644 --- a/recipes/android/cores-android-armv7-ndk +++ b/recipes/android/cores-android-armv7-ndk @@ -1,7 +1,4 @@ mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git PROJECT YES GENERIC Makefile . mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC Makefile . mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile . VRENDER=soft emulator -mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mame -mess2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mess -ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=ume scummvm libretro-scummvm https://github.com/libretro/scummvm.git PROJECT YES GENERIC Makefile backends/platform/libretro/build diff --git a/recipes/android/cores-android-armv7-ndk-mame b/recipes/android/cores-android-armv7-ndk-mame index a4ac1531..cef26560 100644 --- a/recipes/android/cores-android-armv7-ndk-mame +++ b/recipes/android/cores-android-armv7-ndk-mame @@ -1,2 +1,4 @@ mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC makefile . OSD=retro RETRO=1 NOWERROR=1 NOASM=1 gcc=android-arm TARGETOS=android-arm CONFIG=libretro USE_BGFX=0 NO_USE_MIDI=1 OS=linux VERBOSE=1 verbose=1 - +mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mame +mess2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mess +ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=ume diff --git a/recipes/android/cores-android-armv7-ndk-mame.conf b/recipes/android/cores-android-armv7-ndk-mame.conf index ee75091f..21e7f9c9 100644 --- a/recipes/android/cores-android-armv7-ndk-mame.conf +++ b/recipes/android/cores-android-armv7-ndk-mame.conf @@ -1,8 +1,8 @@ -PATH /home/buildbot/tools/android/android-ndk-r10e-standalone-arm-19/bin/ +PATH /home/buildbot/tools/android/android-ndk-r10e-standalone-arm/bin/ ANDROID_NDK_ARM /home/buildbot/tools/android/android-ndk-r10e/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64 ANDROID_NDK_ROOT /home/buildbot/tools/android/android-ndk-r10e/ -PLATFORM android-armv7 -platform android-armv7 +PLATFORM android +platform android LIBSUFFIX _android MAKE make DIST armeabi-v7a diff --git a/recipes/android/cores-android-armv7-ndk.conf b/recipes/android/cores-android-armv7-ndk.conf index 2d0e3091..e95783ff 100644 --- a/recipes/android/cores-android-armv7-ndk.conf +++ b/recipes/android/cores-android-armv7-ndk.conf @@ -1,6 +1,6 @@ -PATH /home/buildbot/tools/android/android-ndk-r10e-standalone-arm-19/bin -PLATFORM android -platform android +PATH /home/buildbot/tools/android/android-ndk-r10e-standalone-arm/bin +PLATFORM android-armv7 +platform android-armv7 LIBSUFFIX _android MAKE make CORE_JOB YES