Merge branch 'master' of github.com:libretro/libretro-super

libretro-buildbot-recipe.sh

@@ -319,6 +319,7 @@ build_libretro_generic_theos() {
 
 build_libretro_generic_jni() {
 
+    echo PARAMETERS: DIR $2, SUBDIR: $3
 
     NAME=$1
     DIR=$2
@@ -362,6 +363,54 @@ build_libretro_generic_jni() {
     done
 }
 
+build_libretro_bsnes_jni() {
+
+    echo PARAMETERS: DIR $2, SUBDIR: $3
+
+    NAME=$1
+    DIR=$2
+    SUBDIR=$3
+    MAKEFILE=$4
+    PLATFORM=$5
+    PROFILE=$6
+
+    CORENAME=bsnes
+
+    cd ${DIR}/${SUBDIR}
+
+    for a in "${ABIS[@]}"; do
+        if [ -z "${NOCLEAN}" ];
+        then
+	    echo "cleaning up..."
+	    echo "cleanup command: ${NDK} -j${JOBS} APP_ABI=${a} clean"
+	        ${NDK} -j${JOBS} APP_ABI=${a} clean
+	        if [ $? -eq 0 ];
+	    then
+	        echo success!
+	    else
+	        echo error while cleaning up
+	    fi
+        fi
+
+	echo "compiling for ${a}..."
+        if [ -z "${ARGS}" ]
+        then
+	    echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}"
+	    ${NDK} -j${JOBS} APP_ABI=${a}
+        else
+	    echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a}"
+	    ${NDK} -j${JOBS} APP_ABI=${a}
+        fi
+        if [ $? -eq 0 ];
+        then
+	    echo success!
+	    cp -v ../libs/${a}/libretro_${CORENAME}_${PROFILE}.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${NAME}_libretro_${PROFILE}${FORMAT}.${FORMAT_EXT}
+        else
+	    echo error while compiling $1
+        fi
+    done
+}
+
 
 build_libretro_generic_gl_makefile() {
 
@@ -512,7 +561,7 @@ while read line; do
         echo COMMAND: $COMMAND
    	echo MAKEFILE: $MAKEFILE
         echo DIR: $DIR
-        echo SUBDIR: $DIR
+        echo SUBDIR: $SUBDIR
 
 
         ARGS=""
@@ -658,6 +707,8 @@ while read line; do
 		    build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
 	    elif [ "${COMMAND}" == "GENERIC_JNI" ]; then
 		    build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
+	    elif [ "${COMMAND}" == "BSNES_JNI" ]; then
+		    build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
 	    elif [ "${COMMAND}" == "GENERIC_THEOS" ]; then
 		    build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
 	    elif [ "${COMMAND}" == "BSNES" ]; then
@@ -785,7 +836,7 @@ then
 
 fi
 
-if [ "${PLATFORM}" == "android" ];
+if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ];
 then
 
     while read line; do

recipes/recipes-android

@@ -22,7 +22,7 @@ mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/bee
 mednafen_vb libretro-mednafen_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_wswan libretro-mednafen_wswan https://github.com/libretro/beetle-wswan-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 meteor libretro-meteor  https://github.com/libretro/meteor-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
-mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
+mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT NO GENERIC_JNI Makefile libretro/jni 
 nestopia libretro-nestopia https://github.com/libretro/nestopia.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 o2em libretro-o2em https://github.com/libretro/libretro-o2em.git PROJECT YES GENERIC_JNI Makefile jni 
@@ -40,3 +40,5 @@ vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GEN
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
+bsnes libretro-bsnes https://github.com/libretro/bsnes-libretro.git PROJECT YES BSNES_JNI Makefile target-libretro/jni performance 
+bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES_JNI Makefile target-libretro/jni performance 

recipes/recipes-android-r9

@@ -0,0 +1 @@
+mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni 

recipes/recipes-android-r9.conf

@@ -0,0 +1,8 @@
+ANDROID_HOME /opt/android-sdk
+NDK_ROOT /opt/android-ndk-r9
+ANDROID_NDK /opt/android-ndk-r9
+PATH /opt/android-ndk-r9:/opt/android-sdk/tools
+PLATFORM android
+platform android
+NDK ndk-build
+RA NO

recipes/recipes-android.conf

@@ -6,3 +6,4 @@ PLATFORM android
 platform android
 MAKE make
 NDK ndk-build
+RA YES