Rebase/Merge.

This commit is contained in:
Sérgio Benjamim 2017-03-08 02:56:25 -03:00
commit 6d08cf8c7e
6 changed files with 23 additions and 3 deletions

View File

@ -14,4 +14,4 @@ firmware_count = 1
firmware0_desc = "syscard3.pce (PCE-CD BIOS)"
firmware0_path = "syscard3.pce"
firmware0_opt = "false"
notes = "(!) syscard3.pce (md5): 38179df8f4ac870017db21ebcbf53114"
notes = "(!) syscard3.pce (md5): 38179df8f4ac870017db21ebcbf53114|[i] For cue files track type use:|[i] OGG for ogg files|[i] WAVE for wav files|[i] BINARY for iso files"

View File

@ -1307,6 +1307,7 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
cp -rf media/assets/glui pkg/android/phoenix/assets/assets/
cp -rf media/assets/xmb pkg/android/phoenix/assets/assets/
cp -rf media/assets/zarch pkg/android/phoenix/assets/assets/
cp -rf media/assets/s* pkg/android/phoenix/assets/assets/
cp -rf media/autoconfig/* pkg/android/phoenix/assets/autoconfig/
cp -rf media/overlays/* pkg/android/phoenix/assets/overlays/
cp -rf media/shaders_glsl/* pkg/android/phoenix/assets/shaders/shaders_glsl/

View File

@ -0,0 +1 @@

View File

@ -0,0 +1,11 @@
ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux
NDK_ROOT /home/buildbot/tools/android/android-ndk-r13b/
ANDROID_NDK /home/buildbot/tools/android/android-ndk-r13b/
PATH /home/buildbot/tools/android/android-ndk-r13b/:/home/buildbot/tools/android/android-sdk-linux/tools
PLATFORM android
platform android
MAKE make
NDK ndk-build
RA YES
LIBSUFFIX _android
JAVA_HOME /usr/lib/jvm/java-8-oracle

View File

@ -0,0 +1,7 @@
retroarch retroarch-dev git@github.com:libretro/RetroArchPro.git SUBMODULE YES .
overlays overlays https://github.com/libretro/common-overlays.git ASSETS YES retroarch-dev/media
shaders shaders_cg https://github.com/libretro/common-shaders.git ASSETS YES retroarch-dev/media
autoconfig autoconfig https://github.com/libretro/retroarch-joypad-autoconfig.git ASSETS YES retroarch-dev/media
assets assets git@github.com:libretro/retroarch-assets-pro.git ASSETS YES retroarch-dev/media
libretrodb libretrodb https://github.com/libretro/libretro-database.git ASSETS YES retroarch-dev/media

View File

@ -33,12 +33,12 @@ hatari libretro-hatari https://github.com/libretro/libretro-hatari.git PROJECT Y
lutro libretro-lutro https://github.com/libretro/libretro-lutro PROJECT YES GENERIC Makefile .
mame libretro-mame https://github.com/libretro/mame.git PROJECT YES GENERIC Makefile.libretro . PTR64=1
mame2000 libretro-mame2000 https://github.com/libretro/mame2000-libretro.git PROJECT YES GENERIC Makefile .
mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC Makefile .
mame2003 libretro-mame2003 https://github.com/libretro/mame2003-libretro.git PROJECT YES GENERIC Makefile .
mame2010 libretro-mame2010 https://github.com/libretro/mame2010-libretro.git PROJECT YES GENERIC Makefile . VRENDER=soft PTR64=1
mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mame PTR64=1
mess2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mess PTR64=1
ume2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=ume PTR64=1
mame2016 libretro-mame2016 https://github.com/libretro/mame2016-libretro PROJECT YES GENERIC Makefile.libretro . PTR64=1
mame2016 libretro-mame2016 https://github.com/libretro/mame2016-libretro PROJECT YES GENERIC Makefile.libretro . PTR64=1
mednafen_gba libretro-beetle_gba https://github.com/libretro/beetle-gba-libretro.git PROJECT YES GENERIC Makefile .
mednafen_lynx libretro-beetle_lynx https://github.com/libretro/beetle-lynx-libretro.git PROJECT YES GENERIC Makefile .
mednafen_ngp libretro-beetle_ngp https://github.com/libretro/beetle-ngp-libretro.git PROJECT YES GENERIC Makefile .