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

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

@ -27,8 +27,7 @@ while read line; do
else
export ${KEY}=${VALUE}
echo $KEY: $VALUE
echo $KEY: $VALUE
fi
done < $1.conf
echo
@ -79,7 +78,7 @@ IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
mkdir $RARCH_DIST_DIR/${a}
fi
done
if [ "$HOST_CC" ]; then
CC="${HOST_CC}-gcc"
CXX="${HOST_CC}-g++"
@ -213,8 +212,7 @@ build_libretro_generic_makefile() {
else
echo error while compiling $1
fi
}
build_libretro_generic_jni() {
@ -227,8 +225,9 @@ build_libretro_generic_jni() {
PLATFORM=$5
ARGS=$6
cd $DIR
cd $SUBDIR
echo DIR=$2 SUBDIR=$3
cd ${DIR}/${SUBDIR}
for a in "${ABIS[@]}"; do
if [ -z "${NOCLEAN}" ];
@ -243,7 +242,7 @@ build_libretro_generic_jni() {
echo error while cleaning up
fi
fi
echo "compiling for ${a}..."
if [ -z "${ARGS}" ]
then
@ -251,12 +250,12 @@ build_libretro_generic_jni() {
${NDK} -j${JOBS} APP_ABI=${a}
else
echo "buid command: ${NDK} -j${JOBS} APP_ABI=${a} ${ARGS} "
${NDK} -j${JOBS} APP_ABI=${a} ${ARGS}
${NDK} -j${JOBS} APP_ABI=${a} ${ARGS}
fi
if [ $? -eq 0 ];
then
echo success!
cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT}
then
echo success!
cp -v ../libs/${a}/libretro.${FORMAT_EXT} $RARCH_DIST_DIR/${a}/${1}_libretro${FORMAT}.${FORMAT_EXT}
else
echo error while compiling $1
fi
@ -313,7 +312,7 @@ build_libretro_generic_gl_makefile() {
reset_compiler_targets
}
@ -346,7 +345,7 @@ build_libretro_bsnes() {
if [ $? -eq 0 ];
then
then
echo success!
else
echo error while cleaning up
@ -369,7 +368,7 @@ build_libretro_bsnes() {
fi
if [ $? -eq 0 ];
then
then
echo success!
if [ "${PROFILE}" == "cpp98" ];
then
@ -384,7 +383,6 @@ build_libretro_bsnes() {
echo error while compiling $1
fi
}
#fetch a project and mark it for building if there have been any changes
@ -394,7 +392,7 @@ echo
echo
while read line; do
NAME=`echo $line | cut --fields=1 --delimiter=" "`
DIR=`echo $line | cut --fields=2 --delimiter=" "`
URL=`echo $line | cut --fields=3 --delimiter=" "`
@ -403,7 +401,7 @@ while read line; do
COMMAND=`echo $line | cut --fields=6 --delimiter=" "`
MAKEFILE=`echo $line | cut --fields=7 --delimiter=" "`
SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
if [ "${ENABLED}" == "YES" ];
then
echo "Processing $NAME"
@ -503,7 +501,7 @@ while read line; do
cd $DIR
echo "pulling from repo... "
OUT=`git pull`
OUT=`git pull`
if [[ $OUT == *"Already up-to-date"* ]]
then
BUILD="NO"
@ -515,12 +513,12 @@ while read line; do
else
echo "cloning repo..."
git clone "$URL" "$DIR" --depth=1
cd $DIR
cd $DIR
git checkout $TYPE
cd ..
BUILD="YES"
fi
fi
elif [ "${TYPE}" == "SUBMODULE" ];
then
if [ -d "${DIR}/.git" ];
@ -543,7 +541,7 @@ while read line; do
cd $DIR
git submodule update --init
BUILD="YES"
fi
fi
fi
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
@ -556,7 +554,7 @@ while read line; do
elif [ "${COMMAND}" == "GENERIC_ALT" ]; then
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}"
build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
elif [ "${COMMAND}" == "BSNES" ]; then
build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
@ -567,11 +565,11 @@ while read line; do
echo
fi
cd "${BASE_DIR}"
PREVCORE=$NAME
PREVBUILD=$BUILD
done < $1
echo "Building RetroArch"
@ -590,7 +588,7 @@ then
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
if [ "${ENABLED}" == "YES" ];
then
echo "Processing $NAME"
@ -643,7 +641,7 @@ then
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
echo ARGS: $ARGS
if [ -d "${DIR}/.git" ];
then
@ -693,7 +691,7 @@ then
TYPE=`echo $line | cut --fields=4 --delimiter=" "`
ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
if [ "${ENABLED}" == "YES" ];
then
echo "Processing $NAME"
@ -743,10 +741,10 @@ then
ARGS="${ARGS} ${TEMP}"
fi
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
ARGS="${ARGS%"${ARGS##*[![:space:]]}"}"
echo ARGS: $ARGS
if [ -d "${PARENTDIR}/${DIR}/.git" ];
then
cd $PARENTDIR
@ -754,16 +752,16 @@ then
echo "pulling from repo... "
OUT=`git pull`
echo $OUT
if [ "${TYPE}" == "PROJECT" ];
then
RADIR=$DIR
if [ "${TYPE}" == "PROJECT" ];
then
RADIR=$DIR
if [[ $OUT == *"Already up-to-date"* ]]
then
BUILD="NO"
else
BUILD="YES"
fi
fi
fi
cd $WORK
else
@ -771,55 +769,53 @@ then
cd $PARENTDIR
git clone "$URL" "$DIR" --depth=1
cd $DIR
if [ "${TYPE}" == "PROJECT" ];
then
if [ "${TYPE}" == "PROJECT" ];
then
BUILD="YES"
fi
RADIR=$DIR
fi
cd $WORK
fi
fi
echo
echo
done < $1.ra
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ];
then
echo "Compiling Shaders"
echo ============================================
cd $RADIR
$MAKE -f Makefile.griffin shaders-convert-glsl PYTHON3=$PYTHON
echo RADIR $RADIR
cd $RADIR
$MAKE -f Makefile.griffin shaders-convert-glsl PYTHON3=$PYTHON
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/
echo "Building"
echo ============================================
cd android/phoenix
rm bin/*.apk
ndk-build.cmd clean
ndk-build.cmd -j8
android.bat update project --path . --target android-21
android.bat update project --path libs/googleplay --target android-21
android.bat update project --path libs/appcompat --target android-21
ant debug
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/
echo "Building"
echo ============================================
cd android/phoenix
rm bin/*.apk
$NDK clean
$NDK -j8
android update project --path . --target android-21
android update project --path libs/googleplay --target android-21
android update project --path libs/appcompat --target android-21
ant debug
fi
fi
PATH=$ORIGPATH

View File

@ -1,42 +1,42 @@
2048 libretro-2048 https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC_JNI Makefile jni
3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git PROJECT YES GENERIC_JNI Makefile jni
4do libretro-4do https://github.com/libretro/4do-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
dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile android/eclipse/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
gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro libgambatte/libretro/jni
genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC_JNI Makefile jni
handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC_JNI Makefile libretro/jni
mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
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
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
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC_JNI Makefile.libretro jni
picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC_JNI Makefile.libretro jni
ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git SUBMODULE YES GENERIC_JNI Makefile.libretro libretro/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_next libretro-snes9x_next https://github.com/libretro/snes9x-next.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
tgbdual libretro-tgbdual https://github.com/libretro/tgbdual-libretro.git PROJECT YES GENERIC_JNI Makefile 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
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
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
2048 libretro-2048 https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC_JNI Makefile jni
3dengine libretro-3dengine https://github.com/libretro/libretro-3dengine.git PROJECT YES GENERIC_JNI Makefile jni
4do libretro-4do https://github.com/libretro/4do-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
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
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
genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC_JNI Makefile.libretro libretro/jni
gpsp libretro-gpsp https://github.com/libretro/gpsp.git PROJECT YES GENERIC_JNI Makefile jni
handy libretro-handy https://github.com/libretro/libretro-handy.git PROJECT YES GENERIC_JNI Makefile libretro/jni
mednafen_gba libretro-mednafen_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_lynx libretro-mednafen_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_ngp libretro-mednafen_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_pce_fast libretro-mednafen_pce_fast https://github.com/libretro/beetle-pce-fast-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_pcfx libretro-mednafen_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_psx libretro-mednafen_psx https://github.com/libretro/mednafen-psx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_snes libretro-mednafen_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC_JNI Makefile jni
mednafen_supergrafx libretro-mednafen_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC_JNI Makefile jni
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
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
pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git PROJECT YES GENERIC_JNI Makefile.libretro jni
picodrive libretro-picodrive https://github.com/libretro/picodrive.git SUBMODULE YES GENERIC_JNI Makefile.libretro jni
ppsspp libretro-ppsspp https://github.com/libretro/ppsspp.git SUBMODULE YES GENERIC_JNI Makefile.libretro libretro/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_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
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
vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_JNI Makefile src/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
yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC_JNI Makefile libretro/jni

View File

@ -1,8 +1,8 @@
ANDROID_HOME /c/Toolchains/android/
NDK_ROOT /c/Toolchains/android/ndk/
ANDROID_NDK /c/Toolchains/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
ANDROID_HOME /opt/android-sdk
NDK_ROOT /opt/android-ndk
ANDROID_NDK /opt/android-ndk
PATH /opt/android-ndk:/opt/android-sdk/tools
PLATFORM android
platform android
MAKE make
NDK ndk-build.cmd
PYTHON /c/Toolchains/python3/python.exe
NDK ndk-build

View File

@ -1,4 +1,4 @@
retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES .
overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media
shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch/media
autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch/media
retroarch retroarch https://github.com/libretro/Retroarch.git PROJECT YES .
overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch/media
shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch/media
autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch/media