From 13d2d0fbbdd267bbb851dac091ac8e14fba67d8b Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 25 Mar 2015 15:24:38 -0400 Subject: [PATCH] patch for mame in radius bot --- libretro-buildbot-recipe.sh | 2 +- libretro-config.sh | 4 ++-- recipes/android/ndk-standalone-mame-armv7.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index e337c550..57afac9c 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -225,7 +225,7 @@ build_libretro_generic_makefile() { echo "$1 running retrolink ($jobid)" $WORK/retrolink.sh ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} fi - cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} + cp -v ${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} $RARCH_DIST_DIR/${DIST}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT} else MESSAGE="$1 build failed ($jobid)" fi diff --git a/libretro-config.sh b/libretro-config.sh index 404289bb..1b5266fb 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -144,9 +144,9 @@ case "$platform" in android) FORMAT_EXT="so" FORMAT_COMPILER_TARGET="android" - DIST_DIR="android/armeabi-v7a" + DIST_DIR="android" ;; - *android-armv7*) + android-armv7) FORMAT_EXT="so" FORMAT_COMPILER_TARGET="android-armv7" DIST_DIR="android/armeabi-v7a" diff --git a/recipes/android/ndk-standalone-mame-armv7.conf b/recipes/android/ndk-standalone-mame-armv7.conf index a93b1383..f9675560 100644 --- a/recipes/android/ndk-standalone-mame-armv7.conf +++ b/recipes/android/ndk-standalone-mame-armv7.conf @@ -2,5 +2,5 @@ PATH /opt/android-ndk-standalone-r10/bin PLATFORM android platform android SUFFIX _android -DISTDIR _armeabi-v7a MAKE make +DIST armeabi-v7a