mirror of
https://github.com/libretro/libretro-super
synced 2024-12-01 04:03:00 +00:00
Merge branch 'master' of github.com:libretro/libretro-super
Conflicts: libretro-buildbot-recipe.sh
This commit is contained in:
commit
8ffddeace9
@ -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 -rf
|
||||
|
||||
rm -rv *.deb
|
||||
rm -rfv *.deb
|
||||
ln -s $THEOS theos
|
||||
export PRODUCT_NAME=RetroArch
|
||||
$MAKE clean
|
||||
@ -1106,8 +1106,8 @@ then
|
||||
./package.sh
|
||||
|
||||
mkdir obj/RetroArch.app/modules
|
||||
cp -r ../../../dist/theos/*.* obj/RetroArch.app/modules
|
||||
cp -r ../../../dist/info/*.* obj/RetroArch.app/modules
|
||||
cp -rfv ../../../dist/theos/*.* obj/RetroArch.app/modules
|
||||
cp -rfv ../../../dist/info/*.* obj/RetroArch.app/modules
|
||||
|
||||
$MAKE package
|
||||
|
||||
|
@ -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
|
||||
|
1
recipes/recipes-ndk-standalone-armv7
Normal file
1
recipes/recipes-ndk-standalone-armv7
Normal file
@ -0,0 +1 @@
|
||||
mame078 libretro-mame078 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC makefile .
|
5
recipes/recipes-ndk-standalone-armv7.conf
Normal file
5
recipes/recipes-ndk-standalone-armv7.conf
Normal file
@ -0,0 +1,5 @@
|
||||
PATH /opt/android-ndk-standalone/bin
|
||||
PLATFORM android-armv7
|
||||
platform android-armv7
|
||||
SUFFIX _android
|
||||
MAKE make
|
Loading…
Reference in New Issue
Block a user