From 130aaf7e6d2d2d5f1132eb7d99ef36e4391e6c3c Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 4 Jul 2015 20:11:39 -0400 Subject: [PATCH] ammend package --- libretro-buildbot-recipe.sh | 5 +++-- recipes/android/ndk.conf | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 3c778cf6..a7c5eab2 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -874,7 +874,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then - cp -rfv media/assets/* android/phoenix/assets/assets/ + cp -rfv media/assets/xmb android/phoenix/assets/assets/ cp -rfv media/autoconfig/* android/phoenix/assets/autoconfig/ #cp -rfv media/libretrodb/cht android/phoenix/assets/libretrodb/ cp -rfv media/libretrodb/rdb android/phoenix/assets/database/ @@ -895,7 +895,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then $NDK clean &> /tmp/buildbot.log $NDK -j${JOBS} &>> /tmp/buildbot.log ant clean &>> /tmp/buildbot.log - android update project --path . --target android-21 &>> /tmp/buildbot.log + android update project --path . --target android-22 &>> /tmp/buildbot.log android update project --path libs/googleplay --target android-21 &>> /tmp/buildbot.log android update project --path libs/appcompat --target android-21 &>> /tmp/buildbot.log ant debug &>> /tmp/buildbot.log @@ -1211,6 +1211,7 @@ if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = mkdir -p windows/content mkdir -p windows/downloads mkdir -p windows/info + mkdir -p windows/cores mkdir -p windows/config/remap cat << EOF > windows/retroarch.cfg diff --git a/recipes/android/ndk.conf b/recipes/android/ndk.conf index 933b5f15..c3295015 100644 --- a/recipes/android/ndk.conf +++ b/recipes/android/ndk.conf @@ -1,7 +1,7 @@ ANDROID_HOME /opt/android-sdk NDK_ROOT /opt/android-ndk ANDROID_NDK /opt/android-ndk -PATH /opt/android-ndk:/opt/android-sdk/tools +PATH /opt/android-ndk:/opt/android-sdk-linux_r24/tools PLATFORM android platform android MAKE make