ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some android issues

This commit is contained in:
radius 2014-12-23 16:53:38 -05:00
parent 3f339e0f6c
commit c064c54ad8
4 changed files with 116 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libretro-buildbot-recipe.sh Normal file → Executable file
View File

@ -28,7 +28,6 @@ while read line; do
else else
export ${KEY}=${VALUE} export ${KEY}=${VALUE}
echo $KEY: $VALUE echo $KEY: $VALUE
fi fi
done < $1.conf done < $1.conf
echo echo
@ -214,7 +213,6 @@ build_libretro_generic_makefile() {
echo error while compiling $1 echo error while compiling $1
fi fi
} }
build_libretro_generic_jni() { build_libretro_generic_jni() {
@ -227,8 +225,9 @@ build_libretro_generic_jni() {
PLATFORM=$5 PLATFORM=$5
ARGS=$6 ARGS=$6
cd $DIR echo DIR=$2 SUBDIR=$3
cd $SUBDIR
cd ${DIR}/${SUBDIR}
for a in "${ABIS[@]}"; do for a in "${ABIS[@]}"; do
if [ -z "${NOCLEAN}" ]; if [ -z "${NOCLEAN}" ];
@ -384,7 +383,6 @@ build_libretro_bsnes() {
echo error while compiling $1 echo error while compiling $1
fi fi
} }
#fetch a project and mark it for building if there have been any changes #fetch a project and mark it for building if there have been any changes
@ -754,16 +752,16 @@ then
echo "pulling from repo... " echo "pulling from repo... "
OUT=`git pull` OUT=`git pull`
echo $OUT echo $OUT
if [ "${TYPE}" == "PROJECT" ]; if [ "${TYPE}" == "PROJECT" ];
then then
RADIR=$DIR RADIR=$DIR
if [[ $OUT == *"Already up-to-date"* ]] if [[ $OUT == *"Already up-to-date"* ]]
then then
BUILD="NO" BUILD="NO"
else else
BUILD="YES" BUILD="YES"
fi fi
fi fi
cd $WORK cd $WORK
else else
@ -771,10 +769,12 @@ then
cd $PARENTDIR cd $PARENTDIR
git clone "$URL" "$DIR" --depth=1 git clone "$URL" "$DIR" --depth=1
cd $DIR cd $DIR
if [ "${TYPE}" == "PROJECT" ]; if [ "${TYPE}" == "PROJECT" ];
then then
BUILD="YES" BUILD="YES"
fi RADIR=$DIR
fi
cd $WORK cd $WORK
fi fi
fi fi
@ -787,39 +787,35 @@ then
echo "Compiling Shaders" echo "Compiling Shaders"
echo ============================================ echo ============================================
cd $RADIR echo RADIR $RADIR
$MAKE -f Makefile.griffin shaders-convert-glsl PYTHON3=$PYTHON cd $RADIR
$MAKE -f Makefile.griffin shaders-convert-glsl PYTHON3=$PYTHON
echo "Processing Assets" echo "Processing Assets"
echo ============================================ echo ============================================
rm -Rv android/phoenix/assets/overlays rm -Rv android/phoenix/assets/overlays
cp -Rv media/overlays android/phoenix/assets/ cp -Rv media/overlays android/phoenix/assets/
rm -Rv android/phoenix/assets/shaders_glsl rm -Rv android/phoenix/assets/shaders_glsl
cp -Rv media/shaders_glsl android/phoenix/assets/ cp -Rv media/shaders_glsl android/phoenix/assets/
rm -Rv android/phoenix/assets/autoconfig rm -Rv android/phoenix/assets/autoconfig
cp -Rv media/autoconfig android/phoenix/assets/ cp -Rv media/autoconfig android/phoenix/assets/
rm -Rv android/phoenix/assets/info rm -Rv android/phoenix/assets/info
cp -Rv $RARCH_DIR/info android/phoenix/assets/ cp -Rv $RARCH_DIR/info android/phoenix/assets/
echo "Building" echo "Building"
echo ============================================ echo ============================================
cd android/phoenix
rm bin/*.apk
cd android/phoenix $NDK clean
rm bin/*.apk $NDK -j8
android update project --path . --target android-21
ndk-build.cmd clean android update project --path libs/googleplay --target android-21
ndk-build.cmd -j8 android update project --path libs/appcompat --target android-21
android.bat update project --path . --target android-21 ant debug
android.bat update project --path libs/googleplay --target android-21
android.bat update project --path libs/appcompat --target android-21
ant debug
fi fi
fi fi
PATH=$ORIGPATH PATH=$ORIGPATH

6
recipes/recipes-android
View File

@ -4,6 +4,7 @@
catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC_JNI Makefile jni catsfc libretro-catsfc https://github.com/libretro/CATSFC-libretro.git PROJECT YES GENERIC_JNI Makefile jni
desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni
dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile android/eclipse/jni dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile android/eclipse/jni
fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni
fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC_JNI Makefile.libretro src/drivers/libretro/jni fceumm libretro-fceuumm https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC_JNI Makefile.libretro src/drivers/libretro/jni
fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC_JNI Makefile jni fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro libgambatte/libretro/jni gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro libgambatte/libretro/jni
@ -31,12 +32,11 @@ ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git SUBMODULE YES GENE
prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC_JNI Makefile jni prosystem libretro-prosystem https://github.com/libretro/prosystem-libretro.git PROJECT YES GENERIC_JNI Makefile jni
snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC_JNI Makefile libretro/jni snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC_JNI Makefile libretro/jni
snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni snes9x_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC_JNI Makefile jni
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC_JNI Makefile libretro/jni
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_JNI Makefile src/libretro/jni vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_JNI Makefile src/libretro/jni
fb_alpha libretro-fba https://github.com/libretro/fba-libretro.git PROJECT YES GENERIC_JNI makefile.libretro svn-current/trunk/projectfiles/libretro-android/jni
stella libretro-stella https://github.com/libretro/stella-libretro.git PROJECT YES GENERIC_JNI Makefile jni
tyrquake libretro-tyrquake https://github.com/libretro/tyrquake.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni 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 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 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC_JNI Makefile libretro/jni

12
recipes/recipes-android.conf
View File

@ -1,8 +1,8 @@
ANDROID_HOME /c/Toolchains/android/ ANDROID_HOME /opt/android-sdk
NDK_ROOT /c/Toolchains/android/ndk/ NDK_ROOT /opt/android-ndk
ANDROID_NDK /c/Toolchains/android/ndk/ ANDROID_NDK /opt/android-ndk
PATH /c/Toolchains/android/ant/bin:/c/Toolchains/android/ndk:/c/Toolchains/android/tools:/c/Toolchains/jdk/bin:/c/Toolchains/tools/cg/bin PATH /opt/android-ndk:/opt/android-sdk/tools
PLATFORM android PLATFORM android
platform android
MAKE make MAKE make
NDK ndk-build.cmd NDK ndk-build
PYTHON /c/Toolchains/python3/python.exe