From c8a64418906c924a4454b27ce8eee56b7161d975 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 17 Jan 2015 00:37:59 -0500 Subject: [PATCH 1/3] add standalone toolchain target --- libretro-config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libretro-config.sh b/libretro-config.sh index c9f35a5d..37cfcd47 100755 --- a/libretro-config.sh +++ b/libretro-config.sh @@ -55,10 +55,14 @@ case "$platform" in FORMAT_EXT='dylib' FORMAT_COMPILER_TARGET=theos_ios DIST_DIR=theos;; - *android*) + android) FORMAT_EXT='so' FORMAT_COMPILER_TARGET=android DIST_DIR=android;; + *android-armv7*) + FORMAT_EXT='so' + FORMAT_COMPILER_TARGET=android-armv7 + DIST_DIR=android/armeabi-v7a;; *) FORMAT_EXT='so' FORMAT_COMPILER_TARGET=unix From 87e68bc367b4f49e1ea3e36dfc6e2f79316121cd Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 17 Jan 2015 00:38:41 -0500 Subject: [PATCH 2/3] small fixes --- libretro-buildbot-recipe.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index a9780faa..7413f2cc 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -214,7 +214,7 @@ build_libretro_generic_makefile() { if [ $? -eq 0 ]; then echo success! - 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/${NAME}_libretro${FORMAT}.${FORMAT_EXT} else echo error while compiling $1 fi @@ -261,7 +261,7 @@ build_libretro_generic_makefile() { if [ $? -eq 0 ]; then echo success! - 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/${NAME}_libretro${FORMAT}.${FORMAT_EXT} else echo error while compiling $1 fi @@ -951,14 +951,14 @@ then echo "Processing Assets" echo ============================================ - rm -Rv android/phoenix/assets/overlays - cp -Rv media/overlays android/phoenix/assets/ - rm -Rv android/phoenix/assets/shaders_glsl - cp -Rv media/shaders_glsl android/phoenix/assets/ - rm -Rv android/phoenix/assets/autoconfig - cp -Rv media/autoconfig android/phoenix/assets/ - rm -Rv android/phoenix/assets/info - cp -Rv $RARCH_DIR/info android/phoenix/assets/ + rm -Rfv android/phoenix/assets/overlays + cp -Rfv media/overlays android/phoenix/assets/ + rm -Rfv android/phoenix/assets/shaders_glsl + cp -Rfv media/shaders_glsl android/phoenix/assets/ + rm -Rfv android/phoenix/assets/autoconfig + cp -Rfv media/autoconfig android/phoenix/assets/ + rm -Rfv android/phoenix/assets/info + cp -Rfv $RARCH_DIR/info android/phoenix/assets/ echo "Building" echo ============================================ @@ -1098,7 +1098,7 @@ then cd apple/iOS rm RetroArch.app -rfv - rm -rv *.deb + rm -rfv *.deb ln -s $THEOS theos $MAKE clean @@ -1106,8 +1106,8 @@ then ./package.sh mkdir obj/RetroArch.app/modules - cp -rv ../../../dist/theos/*.* obj/RetroArch.app/modules - cp -rv ../../../dist/info/*.* obj/RetroArch.app/modules + cp -rfv ../../../dist/theos/*.* obj/RetroArch.app/modules + cp -rfv ../../../dist/info/*.* obj/RetroArch.app/modules $MAKE package cp -rv *.deb /home/buildbot/www/.radius/ From d130fb72f9bf3dfba89cf13043c255ffabea4d21 Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 17 Jan 2015 00:41:44 -0500 Subject: [PATCH 3/3] add native toolchain recipe --- recipes/recipes-ndk-standalone-armv7 | 1 + recipes/recipes-ndk-standalone-armv7.conf | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 recipes/recipes-ndk-standalone-armv7 create mode 100644 recipes/recipes-ndk-standalone-armv7.conf diff --git a/recipes/recipes-ndk-standalone-armv7 b/recipes/recipes-ndk-standalone-armv7 new file mode 100644 index 00000000..1dd2c756 --- /dev/null +++ b/recipes/recipes-ndk-standalone-armv7 @@ -0,0 +1 @@ +mame078 libretro-mame078 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile . diff --git a/recipes/recipes-ndk-standalone-armv7.conf b/recipes/recipes-ndk-standalone-armv7.conf new file mode 100644 index 00000000..0defb735 --- /dev/null +++ b/recipes/recipes-ndk-standalone-armv7.conf @@ -0,0 +1,5 @@ +PATH /opt/android-ndk-standalone/bin +PLATFORM android-armv7 +platform android-armv7 +SUFFIX _android +MAKE make