From a9840d668523e9636815edecfd5b887401a650a4 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 11 Jul 2015 18:59:52 -0400 Subject: [PATCH] fix shader location --- libretro-buildbot-recipe.sh | 5 ++--- recipes/android/gw.conf | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index a7f04b0b..82840725 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -853,7 +853,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then rm -rfv android/phoenix/assets/info rm -rfv android/phoenix/assets/overlays rm -rfv android/phoenix/assets/libretrodb - rm -rfv android/phoenix/assets/shaders + rm -rfv android/phoenix/assets/shaders/shaders_glsl rm -rfv android/phoenix/assets/autoconfig @@ -864,7 +864,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then mkdir -p android/phoenix/assets/cores mkdir -p android/phoenix/assets/info mkdir -p android/phoenix/assets/overlays - mkdir -p android/phoenix/assets/shaders_glsl + mkdir -p android/phoenix/assets/shaders/ mkdir -p android/phoenix/assets/database mkdir -p android/phoenix/assets/autoconfig mkdir -p android/phoenix/assets/cheats @@ -884,7 +884,6 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then cp -rfv media/shaders_glsl/* android/phoenix/assets/shaders/shaders_glsl/ cp -rfv media/shaders_glsl /tmp/ touch android/phoenix/assets/cheats/placeholder - touch android/phoenix/assets/cheats/placeholder cp -rfv $RARCH_DIR/info/* android/phoenix/assets/info/ diff --git a/recipes/android/gw.conf b/recipes/android/gw.conf index fbcdb5dd..bae25c66 100644 --- a/recipes/android/gw.conf +++ b/recipes/android/gw.conf @@ -1,7 +1,7 @@ ANDROID_HOME /opt/android-sdk -NDK_ROOT /opt/android-ndk -NDK_ROOT_DIR /opt/android-ndk -ANDROID_NDK /opt/android-ndk +NDK_ROOT /opt/android-ndk-r10e +NDK_ROOT_DIR /opt/android-ndk-r10e +ANDROID_NDK /opt/android-ndk-r10e PATH /opt/android-ndk:/opt/android-sdk/tools PLATFORM android platform android