libretro/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super.git synced 2024-11-23 15:59:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert to legacy rule for PCSX ReARMed (requires http://git.io/pPfR)

Browse Source
This commit is contained in:
T. Joseph Carter 2015-03-12 05:13:57 -07:00
parent 377fb5edb3
commit 9a612eeffc
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libretro-build-common.sh
View File

@ -112,29 +112,6 @@ reset_compiler_targets() {
export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT
}
build_libretro_pcsx_rearmed_interpreter() {
build_dir="$WORKDIR/libretro-pcsx_rearmed"
if build_should_skip "pcsx_rearmed_interpreter" "$build_dir"; then
echo "Core test is already built, skipping..."
return
fi
if [ -d "$build_dir" ]; then
echo '=== Building PCSX ReARMed Interpreter ==='
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 USE_DYNAREC=0 platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\"" || die 'Failed to build PCSX ReARMed'
copy_core_to_dist "pcsx_rearmed" "pcsx_rearmed_interpreter"
build_save_revision $? "pcsx_rearmed_interpreter"
else
echo 'PCSX ReARMed not fetched, skipping ...'
fi
}
# $1 is corename
# $2 is subcorename
# $3 is subdir. In case there is no subdir, enter "." here
@ -205,11 +182,9 @@ build_libretro_generic_makefile() {
# build_makefile
#
# $1 Name of the core
# $2 Subdirectory of makefile (use "." for none)
# $3 Name of makefile
# $4 Either FORMAT_COMPILER_TARGET or an alternative
# $5 Skip copying (for cores that don't produce exactly one core)
# $core_build_subdir Subdir of the makefile (if any)
# $core_build_makefile Name of the makefile (if not {GNUm,m,M}akefile)
# $core_build_platform Usually some variant of $FORMAT_COMPILER_TARGET
build_makefile() {
[ -n "$core_build_subdir" ] && core_build_subdir="/$core_build_subdir"
@ -537,9 +512,6 @@ build_libretro_nx() {
build_libretro_o2em() {
libretro_build_core o2em
}
build_libretro_pcsx_rearmed() {
libretro_build_core pcsx_rearmed
}
build_libretro_picodrive() {
libretro_build_core picodrive
}
@ -803,3 +775,31 @@ build_libretro_mame_prerule() {
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
}

3
libretro-build.sh
View File

@ -157,9 +157,6 @@ build_default_cores() {
if [ $platform != "win" ]; then
libretro_build_core pcsx_rearmed
fi
if [ "$platform" = "ios" ]; then
build_libretro_pcsx_rearmed_interpreter # for non-jailbreak
fi
if [ $platform != "ios" ]; then
libretro_build_core ffmpeg

5
rules.d/core-rules.sh
View File

@ -110,7 +110,10 @@ libretro_tyrquake_build_makefile="Makefile"
register_core "pcsx_rearmed" -theos_ios -ngc -ps3 -psp1 -wii
libretro_pcsx_rearmed_name="PCSX ReARMed"
libretro_pcsx_rearmed_git_url="https://github.com/libretro/pcsx_rearmed.git"
libretro_pcsx_rearmed_build_makefile="Makefile.libretro"
# FIXME: Disabling modern rule so we can build dynarrec and interpreter on iOS
#libretro_pcsx_rearmed_build_makefile="Makefile.libretro"
libretro_pcsx_rearmed_build_rule=legacy
libretro_pcsx_rearmed_build_legacy=build_libretro_pcsx_rearmed
register_core "mednafen_gba" -theos_ios
libretro_mednafen_gba_name="Mednafen/Beetle GBA"