Merge pull request #240 from iKarith/master

MANE is now the only legacy rule
This commit is contained in:
Twinaphex 2015-03-13 20:57:14 +01:00
commit 0ec3382415
2 changed files with 7 additions and 33 deletions

View File

@ -273,7 +273,7 @@ libretro_build_core() {
case "$core_build_rule" in case "$core_build_rule" in
generic_makefile) generic_makefile)
for a in configure preclean prebuild prepkg; do for a in configure preclean prebuild prepkg; do
if [ "$(type -f libretro_${1}_build_$a)" = "function" ]; then if [ "$(type -t libretro_${1}_build_$a 2> /dev/null)" = "function" ]; then
eval "core_build_$a=libretro_${1}_build_$a" eval "core_build_$a=libretro_${1}_build_$a"
else else
eval "core_build_$a=" eval "core_build_$a="
@ -478,31 +478,3 @@ build_libretro_mame_prerule() {
build_save_revision $ret mame build_save_revision $ret mame
} }
build_libretro_pcsx_rearmed() {
build_dir="$WORKDIR/libretro-pcsx_rearmed"
if build_should_skip "pcsx_rearmed" "$build_dir"; then
echo "Core pcsx_rearmed is already built, skipping..."
return
fi
if [ -d "$build_dir" ]; then
echo '=== Building PCSX ReARMed ==='
echo_cmd "cd \"$build_dir\""
if [ -z "$NOCLEAN" ]; then
echo_cmd "$MAKE -f Makefile.libretro platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean PCSX ReARMed'
fi
echo_cmd "$MAKE -f Makefile.libretro platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\"" || die 'Failed to build PCSX ReARMed'
copy_core_to_dist "pcsx_rearmed"
ret=$?
if [ "$platform" = "ios" ]; then
copy_core_to_dist "pcsx_rearmed_interpreter"
ret=$?
fi
build_save_revision $ret "pcsx_rearmed"
else
echo 'PCSX ReARMed not fetched, skipping ...'
fi
}

View File

@ -110,10 +110,12 @@ libretro_tyrquake_build_makefile="Makefile"
register_core "pcsx_rearmed" -theos_ios -ngc -ps3 -psp1 -wii register_core "pcsx_rearmed" -theos_ios -ngc -ps3 -psp1 -wii
libretro_pcsx_rearmed_name="PCSX ReARMed" libretro_pcsx_rearmed_name="PCSX ReARMed"
libretro_pcsx_rearmed_git_url="https://github.com/libretro/pcsx_rearmed.git" libretro_pcsx_rearmed_git_url="https://github.com/libretro/pcsx_rearmed.git"
# FIXME: Disabling modern rule so we can build dynarrec and interpreter on iOS libretro_pcsx_rearmed_build_makefile="Makefile.libretro"
#libretro_pcsx_rearmed_build_makefile="Makefile.libretro" libretro_pcsx_rearmed_build_configure() {
libretro_pcsx_rearmed_build_rule=legacy if [ "$platform" = "ios" ]; then
libretro_pcsx_rearmed_build_legacy=build_libretro_pcsx_rearmed core_build_cores="pcsx_rearmed_interpreter pcsx_rearmed"
fi
}
register_core "mednafen_gba" -theos_ios register_core "mednafen_gba" -theos_ios
libretro_mednafen_gba_name="Mednafen/Beetle GBA" libretro_mednafen_gba_name="Mednafen/Beetle GBA"