diff --git a/libretro-build-common.sh b/libretro-build-common.sh index ae59091f..af424ac2 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -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" @@ -296,7 +271,15 @@ libretro_build_core() { echo "Building ${1}..." build_makefile $1 + ;; + legacy) + eval "core_build_legacy=\$libretro_${1}_build_legacy" + if [ -n "$core_build_legacy" ]; then + echo "Warning: $1 hasn't been ported to a modern build rule yet." + echo " Will build it using legacy \"$core_build_legacy\"..." + $core_build_legacy + fi ;; none) echo "Don't have a build rule for $1, skipping..." @@ -334,23 +317,6 @@ build_libretro_test() { } -build_libretro_emux() { - if build_should_skip emux "$WORKDIR/libretro-emux"; then - echo "Cores for emux are already built, skipping..." - return - fi - - build_libretro_generic_makefile "emux" "libretro" "Makefile" $FORMAT_COMPILER_TARGET 1 - - copy_core_to_dist "emux_chip8" - copy_core_to_dist "emux_gb" - copy_core_to_dist "emux_nes" - copy_core_to_dist "emux_sms" - - # TODO: Check for more than emux_sms here... - build_save_revision $? "emux" -} - build_libretro_mame_modern() { build_dir="$WORKDIR/libretro-mame" if [ -d "$build_dir" ]; then @@ -385,55 +351,6 @@ build_libretro_mame_modern() { fi } -build_libretro_mame_prerule() { - build_dir="$WORKDIR/libretro-mame" - - if build_should_skip mame "$build_dir"; then - echo "Core mame is already built, skipping..." - return - fi - - if [ -d "$build_dir" ]; then - echo '' - echo "=== Building MAME ===" - echo_cmd "cd \"$build_dir\"" - - local extra_args - [ "$X86_64" = "true" ] && extra_args="PTR64=1" - - if [ -z "$NOCLEAN" ]; then - echo_cmd "$MAKE -f Makefile.libretro $extra_args platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' - fi - - if [ -n "$IOS" ]; then - # FIXME: iOS doesn't build right now, so let's leave this simple until it does. - target=mame - echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" \"NATIVE=1\" buildtools \"-j$JOBS\"" - ret=$? - if [ "$ret" = 0 ]; then - echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\"" - ret=$? - fi - [ "$ret" -gt 0 ] && die 'Failed to build MAME' - build_summary_log $ret "$target" - else - for target in mame mess ume; do - echo_cmd "$MAKE -f Makefile.libretro $extra_args \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\" emulator" || die "Failed to build $target" - copy_core_to_dist "$target" - ret=$? - - # If a target fails, stop here... - [ $ret -eq 0 ] || break - done - fi - - else - echo 'MAME not fetched, skipping ...' - fi - - build_save_revision $ret mame -} - # radius uses these, let's not pull them out from under him just yet build_libretro_mame() { build_libretro_mame_modern "MAME" "mame" "" @@ -451,145 +368,6 @@ rebuild_libretro_ume() { build_libretro_mame_modern "UME" "ume" "1" } -# $1 is corename -# $2 is profile shortname. -# $3 is profile name -build_libretro_bsnes_modern() { - build_dir="$WORKDIR/libretro-$1" - if [ -d "$build_dir" ]; then - echo "=== Building $1 $3 ===" - echo_cmd "cd \"$build_dir\"" - - if [ -z "$NOCLEAN" ]; then - echo_cmd "rm -f obj/*.{o,\"$FORMAT_EXT\"}" - echo_cmd "rm -f out/*.{o,\"$FORMAT_EXT\"}" - fi - - cmdline="$MAKE target=libretro -j$JOBS" - cmdline="$cmdline platform=\"$FORMAT_COMPILER_TARGET\"" - cmdline="$cmdline compiler=\"$CXX11\"" - ret=0 - for a in accuracy balanced performance; do - echo_cmd "$cmdline profile=$a" - copy_core_to_dist "out/${1}_$a" "${1}_$a" - [ $ret -eq 0 ] || break - done - - return $ret - else - echo "$1 not fetched, skipping ..." - fi -} - -build_libretro_bsnes() { - if build_should_skip bsnes "$WORKDIR/libretro-bsnes"; then - echo "Core bsnes is already built, skipping..." - return - fi - - build_libretro_bsnes_modern "bsnes" - build_save_revision $? bsnes -} - -build_libretro_bsnes_mercury() { - if build_should_skip bsnes_mercury "$WORKDIR/libretro-bsnes"; then - echo "Core bsnes_mercury is already built, skipping..." - return - fi - - build_libretro_bsnes_modern "bsnes_mercury" - build_save_revision $? bsnes_mercury -} - -build_libretro_bsnes_cplusplus98() { - CORENAME="bsnes_cplusplus98" - build_dir="$WORKDIR/libretro-$CORENAME" - - if build_should_skip $CORENAME "$build_dir"; then - echo "Core $CORENAME is already built, skipping..." - return - fi - - if [ -d "$build_dir" ]; then - echo "=== Building $CORENAME ===" - echo_cmd "cd \"$build_dir\"" - - if [ -z "$NOCLEAN" ]; then - # byuu's "make clean" doesn't - echo_cmd "rm -f obj/*.{o,\"$FORMAT_EXT\"}" - echo_cmd "rm -f out/*.{o,\"$FORMAT_EXT\"}" - fi - - echo_cmd "$MAKE platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\"" - copy_core_to_dist "out/$CORENAME" "$CORENAME" - build_save_revision $? $CORENAME - else - echo "$CORENAME not fetched, skipping ..." - fi -} - -build_libretro_bnes() { - build_dir="$WORKDIR/libretro-bnes" - - if build_should_skip bnes "$build_dir"; then - echo "Core bnes is already built, skipping..." - return - fi - - if [ -d "$build_dir" ]; then - echo '=== Building bNES ===' - echo_cmd "cd \"$build_dir\"" - - mkdir -p obj - if [ -z "$NOCLEAN" ]; then - echo_cmd "$MAKE -f Makefile \"-j$JOBS\" clean" || die 'Failed to clean bNES' - fi - echo_cmd "$MAKE -f Makefile $COMPILER \"-j$JOBS\" compiler=\"${CXX11}\"" || die 'Failed to build bNES' - copy_core_to_dist "bnes" - build_save_revision $? "bnes" - else - echo 'bNES not fetched, skipping ...' - fi -} - -build_libretro_mupen64() { - if check_opengl; then - build_dir="$WORKDIR/libretro-mupen64plus" - - if build_should_skip mupen64plus "$build_dir"; then - echo "Core mupen64plus is already built, skipping..." - return - fi - - if [ -d "$build_dir" ]; then - echo_cmd "cd \"$build_dir\"" - - mkdir -p obj - - if iscpu_x86_64 $ARCH; then - dynarec="WITH_DYNAREC=x86_64" - elif iscpu_x86 $ARCH; then - dynarec="WITH_DYNAREC=x86" - elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "$platform" = "ios" ]; then - dynarec="WITH_DYNAREC=arm" - fi - - echo '=== Building Mupen 64 Plus ===' - if [ -z "$NOCLEAN" ]; then - echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64' - fi - - echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" $COMPILER \"-j$JOBS\"" || die 'Failed to build Mupen 64' - - copy_core_to_dist "mupen64plus" - build_save_revision $? "mupen64plus" - else - echo 'Mupen64 Plus not fetched, skipping ...' - fi - reset_compiler_targets - fi -} - build_summary() { if [ -z "$NOBUILD_SUMMARY" ]; then if command -v fmt > /dev/null; then @@ -630,7 +408,7 @@ create_dist_dir ########## LEGACY RULES -# TODO: delete these +# TODO: Safe to delete these when scripts no longer reference them build_libretro_2048() { libretro_build_core 2048 @@ -734,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 } @@ -794,3 +569,237 @@ build_libretro_gw() { build_libretro_lutro() { libretro_build_core lutro } + +########## LEGACY RULES +# TODO: Port these to modern rules + +build_libretro_bnes() { + build_dir="$WORKDIR/libretro-bnes" + + if build_should_skip bnes "$build_dir"; then + echo "Core bnes is already built, skipping..." + return + fi + + if [ -d "$build_dir" ]; then + echo '=== Building bNES ===' + echo_cmd "cd \"$build_dir\"" + + mkdir -p obj + if [ -z "$NOCLEAN" ]; then + echo_cmd "$MAKE -f Makefile \"-j$JOBS\" clean" || die 'Failed to clean bNES' + fi + echo_cmd "$MAKE -f Makefile $COMPILER \"-j$JOBS\" compiler=\"${CXX11}\"" || die 'Failed to build bNES' + copy_core_to_dist "bnes" + build_save_revision $? "bnes" + else + echo 'bNES not fetched, skipping ...' + fi +} + +build_libretro_bsnes_modern() { + build_dir="$WORKDIR/libretro-$1" + if [ -d "$build_dir" ]; then + echo "=== Building $1 ===" + echo_cmd "cd \"$build_dir\"" + + if [ -z "$NOCLEAN" ]; then + echo_cmd "rm -f obj/*.{o,\"$FORMAT_EXT\"}" + echo_cmd "rm -f out/*.{o,\"$FORMAT_EXT\"}" + fi + + cmdline="$MAKE target=libretro -j$JOBS" + cmdline="$cmdline platform=\"$FORMAT_COMPILER_TARGET\"" + cmdline="$cmdline compiler=\"$CXX11\"" + ret=0 + for a in accuracy balanced performance; do + echo_cmd "$cmdline profile=$a" + copy_core_to_dist "out/${1}_$a" "${1}_$a" + [ $ret -eq 0 ] || break + done + + return $ret + else + echo "$1 not fetched, skipping ..." + fi +} + +build_libretro_bsnes() { + if build_should_skip bsnes "$WORKDIR/libretro-bsnes"; then + echo "Core bsnes is already built, skipping..." + return + fi + + build_libretro_bsnes_modern "bsnes" + build_save_revision $? bsnes +} + +build_libretro_bsnes_cplusplus98() { + CORENAME="bsnes_cplusplus98" + build_dir="$WORKDIR/libretro-$CORENAME" + + if build_should_skip $CORENAME "$build_dir"; then + echo "Core $CORENAME is already built, skipping..." + return + fi + + if [ -d "$build_dir" ]; then + echo "=== Building $CORENAME ===" + echo_cmd "cd \"$build_dir\"" + + if [ -z "$NOCLEAN" ]; then + # byuu's "make clean" doesn't + echo_cmd "rm -f obj/*.{o,\"$FORMAT_EXT\"}" + echo_cmd "rm -f out/*.{o,\"$FORMAT_EXT\"}" + fi + + echo_cmd "$MAKE platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\"" + copy_core_to_dist "out/$CORENAME" "$CORENAME" + build_save_revision $? $CORENAME + else + echo "$CORENAME not fetched, skipping ..." + fi +} + +build_libretro_bsnes_mercury() { + if build_should_skip bsnes_mercury "$WORKDIR/libretro-bsnes"; then + echo "Core bsnes_mercury is already built, skipping..." + return + fi + + build_libretro_bsnes_modern "bsnes_mercury" + build_save_revision $? bsnes_mercury +} + + +build_libretro_emux() { + if build_should_skip emux "$WORKDIR/libretro-emux"; then + echo "Cores for emux are already built, skipping..." + return + fi + + build_libretro_generic_makefile "emux" "libretro" "Makefile" $FORMAT_COMPILER_TARGET 1 + + copy_core_to_dist "emux_chip8" + copy_core_to_dist "emux_gb" + copy_core_to_dist "emux_nes" + copy_core_to_dist "emux_sms" + + # TODO: Check for more than emux_sms here... + build_save_revision $? "emux" +} + +build_libretro_mupen64() { + if check_opengl; then + build_dir="$WORKDIR/libretro-mupen64plus" + + if build_should_skip mupen64plus "$build_dir"; then + echo "Core mupen64plus is already built, skipping..." + return + fi + + if [ -d "$build_dir" ]; then + echo_cmd "cd \"$build_dir\"" + + mkdir -p obj + + if iscpu_x86_64 $ARCH; then + dynarec="WITH_DYNAREC=x86_64" + elif iscpu_x86 $ARCH; then + dynarec="WITH_DYNAREC=x86" + elif [ "${CORTEX_A8}" ] || [ "${CORTEX_A9}" ] || [ "$platform" = "ios" ]; then + dynarec="WITH_DYNAREC=arm" + fi + + echo '=== Building Mupen 64 Plus ===' + if [ -z "$NOCLEAN" ]; then + echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" \"-j$JOBS\" clean" || die 'Failed to clean Mupen 64' + fi + + echo_cmd "$MAKE $dynarec platform=\"$FORMAT_COMPILER_TARGET_ALT\" $COMPILER \"-j$JOBS\"" || die 'Failed to build Mupen 64' + + copy_core_to_dist "mupen64plus" + build_save_revision $? "mupen64plus" + else + echo 'Mupen64 Plus not fetched, skipping ...' + fi + reset_compiler_targets + fi +} + +build_libretro_mame_prerule() { + build_dir="$WORKDIR/libretro-mame" + + if build_should_skip mame "$build_dir"; then + echo "Core mame is already built, skipping..." + return + fi + + if [ -d "$build_dir" ]; then + echo '' + echo "=== Building MAME ===" + echo_cmd "cd \"$build_dir\"" + + local extra_args + [ "$X86_64" = "true" ] && extra_args="PTR64=1" + + if [ -z "$NOCLEAN" ]; then + echo_cmd "$MAKE -f Makefile.libretro $extra_args platform=\"$FORMAT_COMPILER_TARGET\" \"-j$JOBS\" clean" || die 'Failed to clean MAME' + fi + + if [ -n "$IOS" ]; then + # FIXME: iOS doesn't build right now, so let's leave this simple until it does. + target=mame + echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" \"NATIVE=1\" buildtools \"-j$JOBS\"" + ret=$? + if [ "$ret" = 0 ]; then + echo_cmd "$MAKE -f Makefile.libretro \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" CC=\"$CC\" CXX=\"$CXX\" emulator \"-j$JOBS\"" + ret=$? + fi + [ "$ret" -gt 0 ] && die 'Failed to build MAME' + build_summary_log $ret "$target" + else + for target in mame mess ume; do + echo_cmd "$MAKE -f Makefile.libretro $extra_args \"TARGET=$target\" platform=\"$FORMAT_COMPILER_TARGET\" $COMPILER \"-j$JOBS\" emulator" || die "Failed to build $target" + copy_core_to_dist "$target" + ret=$? + + # If a target fails, stop here... + [ $ret -eq 0 ] || break + done + fi + + else + echo 'MAME not fetched, skipping ...' + fi + + 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 +} diff --git a/libretro-build-ngc.sh b/libretro-build-ngc.sh index 93edb14b..d466d536 100755 --- a/libretro-build-ngc.sh +++ b/libretro-build-ngc.sh @@ -29,27 +29,28 @@ MAKE=make if [ $1 ]; then $1 else - build_libretro_bluemsx - build_libretro_fmsx - build_libretro_beetle_lynx - build_libretro_beetle_gba - build_libretro_beetle_ngp - build_libretro_beetle_pce_fast - build_libretro_beetle_supergrafx - build_libretro_beetle_pcfx - build_libretro_beetle_vb - build_libretro_beetle_wswan - build_libretro_beetle_bsnes - build_libretro_snes9x_next - build_libretro_genesis_plus_gx - build_libretro_fba - build_libretro_vba_next - build_libretro_fceumm - build_libretro_gambatte - build_libretro_nx - build_libretro_prboom - build_libretro_quicknes - build_libretro_nestopia - build_libretro_tyrquake - #build_libretro_yabause + libretro_build_core bluemsx + libretro_build_core fceumm + libretro_build_core fmsx + libretro_build_core gambatte + libretro_build_core genesis_plus_gx + libretro_build_core mednafen_bsnes + libretro_build_core mednafen_gba + libretro_build_core mednafen_lynx + libretro_build_core mednafen_ngp + libretro_build_core mednafen_pce_fast + libretro_build_core mednafen_pcfx + libretro_build_core mednafen_supergrafx + libretro_build_core mednafen_vb + libretro_build_core mednafen_wswan + libretro_build_core nestopia + libretro_build_core nxengine + libretro_build_core prboom + libretro_build_core quicknes + libretro_build_core snes9x_next + libretro_build_core tyrquake + libretro_build_core vba_next + #libretro_build_core yabause + + build_libretro_fba # not in libretro-build-common! fi diff --git a/libretro-build-ps3.sh b/libretro-build-ps3.sh index 4f153058..c7816b01 100755 --- a/libretro-build-ps3.sh +++ b/libretro-build-ps3.sh @@ -18,28 +18,28 @@ MAKE=make if [ $1 ]; then $1 else - build_libretro_beetle_lynx - build_libretro_beetle_gba - build_libretro_beetle_ngp - build_libretro_beetle_pce_fast - build_libretro_beetle_supergrafx - build_libretro_beetle_pcfx - build_libretro_beetle_vb - build_libretro_beetle_wswan - build_libretro_mednafen_psx - build_libretro_beetle_bsnes - build_libretro_snes9x_next - build_libretro_genesis_plus_gx - build_libretro_fb_alpha - build_libretro_vba_next - build_libretro_fceumm - build_libretro_gambatte - build_libretro_nx - build_libretro_prboom - build_libretro_stella - build_libretro_quicknes - build_libretro_nestopia - build_libretro_tyrquake - build_libretro_mame078 - build_libretro_handy + libretro_build_core fb_alpha + libretro_build_core fceumm + libretro_build_core gambatte + libretro_build_core genesis_plus_gx + libretro_build_core handy + libretro_build_core mame078 + libretro_build_core mednafen_bsnes + libretro_build_core mednafen_gba + libretro_build_core mednafen_lynx + libretro_build_core mednafen_ngp + libretro_build_core mednafen_pce_fast + libretro_build_core mednafen_pcfx + libretro_build_core mednafen_psx + libretro_build_core mednafen_supergrafx + libretro_build_core mednafen_vb + libretro_build_core mednafen_wswan + libretro_build_core nestopia + libretro_build_core nxengine + libretro_build_core prboom + libretro_build_core quicknes + libretro_build_core snes9x_next + libretro_build_core stella + libretro_build_core tyrquake + libretro_build_core vba_next fi diff --git a/libretro-build-psp1.sh b/libretro-build-psp1.sh index 16d727f3..44d02fe2 100755 --- a/libretro-build-psp1.sh +++ b/libretro-build-psp1.sh @@ -18,37 +18,37 @@ MAKE=make if [ $1 ]; then $1 else - build_libretro_2048 - build_libretro_bluemsx - build_libretro_fmsx - build_libretro_beetle_lynx - build_libretro_beetle_gba - build_libretro_beetle_ngp - build_libretro_beetle_pce_fast - build_libretro_beetle_supergrafx - build_libretro_beetle_pcfx - build_libretro_beetle_vb - build_libretro_beetle_wswan - build_libretro_beetle_bsnes - build_libretro_mednafen - build_libretro_snes9x_next - build_libretro_genesis_plus_gx - #build_libretro_fba_full + libretro_build_core 2048 + libretro_build_core bluemsx + libretro_build_core fceumm + libretro_build_core fmsx + libretro_build_core gambatte + libretro_build_core genesis_plus_gx + libretro_build_core handy + #libretro_build_core mame078 + libretro_build_core mednafen + libretro_build_core mednafen_bsnes + libretro_build_core mednafen_gba + libretro_build_core mednafen_lynx + libretro_build_core mednafen_ngp + libretro_build_core mednafen_pce_fast + libretro_build_core mednafen_pcfx + libretro_build_core mednafen_supergrafx + libretro_build_core mednafen_vb + libretro_build_core mednafen_wswan + libretro_build_core nestopia + libretro_build_core nxengine + libretro_build_core o2em + libretro_build_core picodrive + libretro_build_core prboom + libretro_build_core prosystem + libretro_build_core quicknes + libretro_build_core snes9x_next + libretro_build_core stella + libretro_build_core tgbdual + libretro_build_core tyrquake + libretro_build_core vba_next + libretro_build_core vecx + build_libretro_fba_cps2 - build_libretro_vba_next - build_libretro_fceumm - build_libretro_gambatte - build_libretro_nx - build_libretro_prboom - build_libretro_stella - build_libretro_quicknes - build_libretro_nestopia - build_libretro_tyrquake - #build_libretro_mame078 - build_libretro_picodrive - build_libretro_handy - build_libretro_vecx - build_libretro_tgbdual - build_libretro_prosystem - build_libretro_o2em fi diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh index fe248f73..441f3eb8 100755 --- a/libretro-build-qnx.sh +++ b/libretro-build-qnx.sh @@ -22,57 +22,57 @@ CXX11="QCC -Vgcc_ntoarmv7le" if [ $1 ]; then $1 else - build_libretro_2048 - build_libretro_4do - build_libretro_bluemsx - build_libretro_fmsx - build_libretro_bsnes_cplusplus98 - #build_libretro_bsnes - #build_libretro_bsnes_mercury - build_libretro_beetle_lynx - build_libretro_beetle_gba - build_libretro_beetle_pce_fast - build_libretro_beetle_supergrafx - build_libretro_beetle_pcfx - build_libretro_beetle_vb - build_libretro_beetle_wswan - build_libretro_mednafen_psx - build_libretro_beetle_snes - build_libretro_catsfc - build_libretro_snes9x - build_libretro_snes9x_next - build_libretro_genesis_plus_gx - build_libretro_fb_alpha - build_libretro_vbam - build_libretro_vba_next - build_libretro_fceumm - build_libretro_gambatte - #build_libretro_meteor - build_libretro_nx - build_libretro_prboom - build_libretro_stella - build_libretro_quicknes - build_libretro_nestopia - build_libretro_tyrquake - build_libretro_mame078 - #build_libretro_mame - build_libretro_dosbox - build_libretro_scummvm - build_libretro_picodrive - build_libretro_handy - #build_libretro_desmume - #build_libretro_yabause - build_libretro_pcsx_rearmed - build_libretro_vecx - build_libretro_tgbdual - build_libretro_prosystem - #build_libretro_dinothawr - build_libretro_virtualjaguar - build_libretro_mupen64 - build_libretro_3dengine - #build_libretro_bnes - #build_libretro_ffmpeg - #build_libretro_ppsspp - build_libretro_o2em - build_libretro_gpsp + libretro_build_core 2048 + libretro_build_core 3dengine + libretro_build_core 4do + libretro_build_core bluemsx + #libretro_build_core bnes + #libretro_build_core bsnes + libretro_build_core bsnes_cplusplus98 + #libretro_build_core bsnes_mercury + libretro_build_core catsfc + #libretro_build_core desmume + #libretro_build_core dinothawr + libretro_build_core dosbox + libretro_build_core fb_alpha + #libretro_build_core ffmpeg + libretro_build_core fceumm + libretro_build_core fmsx + libretro_build_core gambatte + libretro_build_core genesis_plus_gx + libretro_build_core gpsp + libretro_build_core handy + #libretro_build_core mame + libretro_build_core mame078 + libretro_build_core mednafen_gba + libretro_build_core mednafen_lynx + libretro_build_core mednafen_pce_fast + libretro_build_core mednafen_pcfx + libretro_build_core mednafen_psx + libretro_build_core mednafen_snes + libretro_build_core mednafen_supergrafx + libretro_build_core mednafen_vb + libretro_build_core mednafen_wswan + #libretro_build_core meteor + libretro_build_core mupen64plus + libretro_build_core nestopia + libretro_build_core nxengine + libretro_build_core o2em + libretro_build_core pcsx_rearmed + libretro_build_core picodrive + #libretro_build_core ppsspp + libretro_build_core prboom + libretro_build_core prosystem + libretro_build_core quicknes + libretro_build_core scummvm + libretro_build_core snes9x + libretro_build_core snes9x_next + libretro_build_core stella + libretro_build_core tgbdual + libretro_build_core tyrquake + libretro_build_core vba_next + libretro_build_core vbam + libretro_build_core vecx + libretro_build_core virtualjaguar + #libretro_build_core yabause fi diff --git a/libretro-build-wii.sh b/libretro-build-wii.sh index 9bd148f2..e0b694a4 100755 --- a/libretro-build-wii.sh +++ b/libretro-build-wii.sh @@ -29,28 +29,29 @@ MAKE=make if [ $1 ]; then $1 else - build_libretro_bluemsx - build_libretro_fmsx - build_libretro_beetle_lynx - build_libretro_beetle_gba - build_libretro_beetle_ngp - build_libretro_beetle_pce_fast - build_libretro_beetle_supergrafx - build_libretro_beetle_pcfx - build_libretro_beetle_psx - build_libretro_beetle_vb - build_libretro_beetle_wswan - build_libretro_beetle_bsnes - build_libretro_snes9x_next - build_libretro_genesis_plus_gx - build_libretro_fba - build_libretro_vba_next - build_libretro_fceumm - build_libretro_gambatte - build_libretro_nx - build_libretro_prboom - build_libretro_quicknes - build_libretro_nestopia - build_libretro_tyrquake - #build_libretro_yabause + libretro_build_core bluemsx + libretro_build_core fceumm + libretro_build_core fmsx + libretro_build_core gambatte + libretro_build_core genesis_plus_gx + libretro_build_core mednafen_bsnes + libretro_build_core mednafen_gba + libretro_build_core mednafen_lynx + libretro_build_core mednafen_ngp + libretro_build_core mednafen_pce_fast + libretro_build_core mednafen_pcfx + libretro_build_core mednafen_psx + libretro_build_core mednafen_supergrafx + libretro_build_core mednafen_vb + libretro_build_core mednafen_wswan + libretro_build_core nestopia + libretro_build_core nxengine + libretro_build_core prboom + libretro_build_core quicknes + libretro_build_core snes9x_next + libretro_build_core tyrquake + libretro_build_core vba_next + #libretro_build_core yabause + + build_libretro_fba # not in libretro-build-common! fi diff --git a/libretro-build.sh b/libretro-build.sh index eea037d3..efc0f1a3 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -126,12 +126,17 @@ build_default_cores() { # Nothing past here supports theos [ "$platform" = "theos_ios" ] && return + libretro_build_core bsnes + libretro_build_core bsnes_cplusplus98 + libretro_build_core bsnes_mercury libretro_build_core dinothawr + libretro_build_core emux libretro_build_core fuse libretro_build_core genesis_plus_gx libretro_build_core gw libretro_build_core hatari libretro_build_core lutro + libretro_build_core mame libretro_build_core mame078 libretro_build_core mednafen_gba libretro_build_core mednafen_lynx @@ -143,30 +148,21 @@ build_default_cores() { libretro_build_core mednafen_supergrafx libretro_build_core mednafen_vb libretro_build_core mednafen_wswan + libretro_build_core mupen64plus libretro_build_core picodrive libretro_build_core scummvm libretro_build_core stonesoup libretro_build_core yabause - build_libretro_bsnes - build_libretro_bsnes_cplusplus98 - build_libretro_bsnes_mercury - build_libretro_emux - build_libretro_mame_prerule - build_libretro_mupen64 - 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 libretro_build_core ppsspp - build_libretro_bnes + libretro_build_core bnes fi build_libretro_test diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index d894749e..09a5c16f 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -3,7 +3,8 @@ register_core "bsnes" -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_bsnes_name="bsnes/higan" libretro_bsnes_git_url="https://github.com/libretro/bsnes-libretro.git" -libretro_bsnes_build_rule=none # NEED CUSTOM RULE +libretro_bsnes_build_rule=legacy +libretro_bsnes_build_legacy=build_libretro_bsnes register_core "snes9x" -ngc -ps3 -psp1 -wii libretro_snes9x_name="SNES9x" @@ -52,7 +53,8 @@ libretro_cap32_build_makefile="Makefile" register_core "bnes" -ios -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_bnes_name="bnes/higan" libretro_bnes_git_url="https://github.com/libretro/bnes-libretro.git" -libretro_bnes_build_rule=none # NEED CUSTOM RULE +libretro_bnes_build_rule=legacy +libretro_bnes_build_legacy=build_libretro_bnes register_core "fceumm" libretro_fceumm_name="FCEUmm" @@ -108,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" @@ -183,7 +188,8 @@ libretro_mame139_build_rule=none # NEED A BUILD RULE register_core "mame" -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_mame_name="MAME (git)" libretro_mame_git_url="https://github.com/libretro/mame.git" -libretro_mame_build_rule=none # NEED CUSTOM RULE +libretro_mame_build_rule=legacy +libretro_mame_build_legacy=build_libretro_mame_prerule register_core "ffmpeg" -ios -theos_ios -osx -ngc -ps3 -psp1 -qnx -wii libretro_ffmpeg_name="FFmpeg" @@ -194,12 +200,14 @@ libretro_ffmpeg_build_opengl="optional" register_core "bsnes_cplusplus98" -theos_ios -ngc -ps3 -psp1 -wii libretro_bsnes_cplusplus98_name="bsnes C++98 (v0.85)" libretro_bsnes_cplusplus98_git_url="https://github.com/libretro/bsnes-libretro-cplusplus98.git" -libretro_bsnes_cplusplus98_build_rule=none # NEED CUSTOM RULE +libretro_bsnes_cplusplus98_build_rule=legacy +libretro_bsnes_cplusplus98_build_legacy=build_libretro_bsnes_cplusplus98 register_core "bsnes_mercury" -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_bsnes_mercury_name="bsnes-mercury" libretro_bsnes_mercury_git_url="https://github.com/libretro/bsnes-mercury.git" -libretro_bsnes_mercury_build_rule=none # NEED CUSTOM RULE +libretro_bsnes_mercury_build_rule=legacy +libretro_bsnes_mercury_build_legacy=build_libretro_bsnes_mercury register_core "picodrive" -theos_ios -ngc -ps3 -wii libretro_picodrive_name="Picodrive" @@ -214,7 +222,8 @@ libretro_tgbdual_git_url="https://github.com/libretro/tgbdual-libretro.git" register_core "mupen64plus" -theos_ios -ngc -ps3 -psp1 -wii libretro_mupen64plus_name="Mupen64Plus" libretro_mupen64plus_git_url="https://github.com/libretro/mupen64plus-libretro.git" -libretro_mupen64plus_build_rule=none # NEED CUSTOM RULE +libretro_mupen64plus_build_rule=legacy +libretro_mupen64plus_build_legacy=build_libretro_mupen64 register_core "dinothawr" -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_dinothawr_name="Dinothawr" @@ -300,7 +309,8 @@ libretro_gpsp_git_url="https://github.com/libretro/gpsp.git" register_core "emux" -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_emux_name="Emux" libretro_emux_git_url="https://github.com/libretro/emux.git" -libretro_emux_build_rule=none # NEED CUSTOM RULE +libretro_emux_build_rule=legacy +libretro_emux_build_legacy=build_libretro_emux register_core "fuse" -theos_ios -ngc -ps3 -psp1 -qnx -wii libretro_fuse_name="Fuse"