diff --git a/libretro-build-common.sh b/libretro-build-common.sh index c86cd5e3..4c382356 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -601,6 +601,30 @@ build_libretro_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 @@ -637,29 +661,6 @@ build_libretro_bsnes() { build_libretro_bsnes_modern "bsnes" build_save_revision $? bsnes } -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_cplusplus98() { CORENAME="bsnes_cplusplus98" 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/rules.d/core-rules.sh b/rules.d/core-rules.sh index f925a249..2ed536a0 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -53,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"