From 41050dc5e15d2d6d60fe4c4238d0bce231cb14c8 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Wed, 4 Mar 2015 19:43:25 -0800 Subject: [PATCH 1/5] Comment edit --- rules.d/core-rules.sh | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index d8de4651..b75e90ff 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -3,8 +3,7 @@ register_module core "bsnes" libretro_bsnes_name="bsnes/higan" libretro_bsnes_git_url="https://github.com/libretro/bsnes-libretro.git" -libretro_bsnes_build_rule=none -# NEED CUSTOM RULE: bsnes +libretro_bsnes_build_rule=none # NEED CUSTOM RULE register_core "snes9x" libretro_snes9x_name="SNES9x" @@ -48,8 +47,7 @@ libretro_handy_git_url="https://github.com/libretro/libretro-handy.git" register_core "bnes" libretro_bnes_name="bnes/higan" libretro_bnes_git_url="https://github.com/libretro/bnes-libretro.git" -libretro_bnes_build_rule=none -# NEED CUSTOM RULE: bnes +libretro_bnes_build_rule=none # NEED CUSTOM RULE register_core "fceumm" libretro_fceumm_name="FCEUmm" @@ -173,14 +171,12 @@ libretro_mame078_git_url="https://github.com/libretro/mame2003-libretro.git" register_core "mame139" libretro_mame139_name="MAME 2010 (0.139)" libretro_mame139_git_url="https://github.com/libretro/mame2010-libretro.git" -libretro_mame139_build_rule=none -# NEED A BUILD RULE: mame139 +libretro_mame139_build_rule=none # NEED A BUILD RULE register_core "mame" libretro_mame_name="MAME (git)" libretro_mame_git_url="https://github.com/libretro/mame.git" -libretro_mame_build_rule=none -# NEED CUSTOM RULE: mame +libretro_mame_build_rule=none # NEED CUSTOM RULE register_core "ffmpeg" libretro_ffmpeg_name="FFmpeg" @@ -191,14 +187,12 @@ libretro_ffmpeg_build_opengl="optional" register_core "bsnes_cplusplus98" 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: bsnes_cplusplus98 +libretro_bsnes_cplusplus98_build_rule=none # NEED CUSTOM RULE register_core "bsnes_mercury" 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: bsnes_mercury +libretro_bsnes_mercury_build_rule=none # NEED CUSTOM RULE register_core "picodrive" libretro_picodrive_name="Picodrive" @@ -213,8 +207,7 @@ libretro_tgbdual_git_url="https://github.com/libretro/tgbdual-libretro.git" register_core "mupen64plus" libretro_mupen64plus_name="Mupen64Plus" libretro_mupen64plus_git_url="https://github.com/libretro/mupen64plus-libretro.git" -libretro_mupen64plus_build_rule=none -# NEED CUSTOM RULE: mupen64plus +libretro_mupen64plus_build_rule=none # NEED CUSTOM RULE register_core "dinothawr" libretro_dinothawr_name="Dinothawr" @@ -224,8 +217,7 @@ libretro_dinothawr_build_platform="$FORMAT_COMPILER_TARGET_ALT" register_core "uae" libretro_uae_name="UAE" libretro_uae_git_url="https://github.com/libretro/libretro-uae.git" -libretro_uae_build_rule=none -# NEED A BUILD RULE: uae +libretro_uae_build_rule=none # NEED A BUILD RULE register_core "3dengine" libretro_3dengine_name="3DEngine" @@ -235,8 +227,7 @@ libretro_3dengine_build_opengl=yes register_core "remotejoy" libretro_remotejoy_name="RemoteJoy" libretro_remotejoy_git_url="https://github.com/libretro/libretro-remotejoy.git" -libretro_remotejoy_build_rule=none -# NEED A BUILD RULE: remotejoy +libretro_remotejoy_build_rule=none # NEED A BUILD RULE register_core "bluemsx" libretro_bluemsx_name="blueMSX" @@ -293,8 +284,7 @@ libretro_hatari_build_makefile="Makefile.libretro" register_core "tempgba" libretro_tempgba_name="TempGBA" libretro_tempgba_git_url="https://github.com/libretro/TempGBA-libretro.git" -libretro_tempgba_build_rule=none -# NEED A BUILD RULE: tempgba +libretro_tempgba_build_rule=none # NEED A BUILD RULE register_core "gpsp" libretro_gpsp_name="gpSP" @@ -303,8 +293,7 @@ libretro_gpsp_git_url="https://github.com/libretro/gpsp.git" register_core "emux" libretro_emux_name="Emux" libretro_emux_git_url="https://github.com/libretro/emux.git" -libretro_emux_build_rule=none -# NEED CUSTOM RULE: emux +libretro_emux_build_rule=none # NEED CUSTOM RULE register_core "fuse" libretro_fuse_name="Fuse" From 3c5128f0fada47b8d7a78bef8776762ec6f35df5 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Thu, 5 Mar 2015 20:50:49 -0800 Subject: [PATCH 2/5] This got left out of my last commit --- libretro-build-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 36b1940f..d5027869 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -294,7 +294,7 @@ libretro_build_core() { core_build_platform="${core_build_platform:-$FORMAT_COMPILER_TARGET}$opengl_type" echo "Building ${1}..." - $core_build_rule $1 + build_makefile $1 ;; none) From b9a89ab70b9078607c07d2b813e12553b3c2cce2 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Fri, 6 Mar 2015 10:31:31 +0100 Subject: [PATCH 3/5] Update core-rules.sh --- rules.d/core-rules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index 35df4c78..e6e52240 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -232,7 +232,7 @@ libretro_3dengine_build_opengl=yes register_core "remotejoy" libretro_remotejoy_name="RemoteJoy" libretro_remotejoy_git_url="https://github.com/libretro/libretro-remotejoy.git" -libretro_remotejoy_build_rule=none # NEED A BUILD RULE +libretro_remotejoy_build_makefile="Makefile" register_core "bluemsx" libretro_bluemsx_name="blueMSX" From c1cc436b44b1093af9b306451a01a65ede5b5af8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 6 Mar 2015 12:49:41 +0100 Subject: [PATCH 4/5] Update core-rules.sh --- rules.d/core-rules.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index e6e52240..57d37525 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -168,10 +168,12 @@ libretro_dosbox_makefile="Makefile.libretro" register_core "virtualjaguar" libretro_virtualjaguar_name="Virtual Jaguar" libretro_virtualjaguar_git_url="https://github.com/libretro/virtualjaguar-libretro.git" +libretro_virtualjaguar_makefile="Makefile" register_core "mame078" libretro_mame078_name="MAME 2003 (0.78)" libretro_mame078_git_url="https://github.com/libretro/mame2003-libretro.git" +libretro_mame078_makefile="Makefile" register_core "mame139" libretro_mame139_name="MAME 2010 (0.139)" From ae76a4fadafae62802b117a00573a48b1bb593f5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 6 Mar 2015 12:55:19 +0100 Subject: [PATCH 5/5] Take out musl now that we no longer need ti --- rules.d/devkit-rules.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rules.d/devkit-rules.sh b/rules.d/devkit-rules.sh index 44591477..cc798854 100644 --- a/rules.d/devkit-rules.sh +++ b/rules.d/devkit-rules.sh @@ -2,7 +2,7 @@ libretro_devkit_name="libretro Developer's Kit" libretro_devkit_fetch_rule=multi_git -libretro_devkit_mgit_urls=5 +libretro_devkit_mgit_urls=4 libretro_devkit_mgit_dir_0="libretro-manifest" libretro_devkit_mgit_url_0="https://github.com/libretro/libretro-manifest.git" libretro_devkit_mgit_dir_1="libretrodb" @@ -11,5 +11,3 @@ libretro_devkit_mgit_dir_2="libretro-dat-pull" libretro_devkit_mgit_url_2="https://github.com/libretro/libretro-dat-pull.git" libretro_devkit_mgit_dir_3="libretro-common" libretro_devkit_mgit_url_3="https://github.com/libretro/libretro-common.git" -libretro_devkit_mgit_dir_4="libretro-musl" -libretro_devkit_mgit_url_4="https://github.com/libretro/musl-libretro.git"