diff --git a/libretro-fetch.sh b/libretro-fetch.sh index 66544719..8e6ca11e 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -24,6 +24,7 @@ fi . "$BASE_DIR/rules.d/core-rules.sh" . "$BASE_DIR/rules.d/player-rules.sh" . "$BASE_DIR/rules.d/devkit-rules.sh" +. "$BASE_DIR/rules.d/lutro-rules.sh" # TODO: Read these programmatically # libretro_fetch: Download the given core using its fetch rules @@ -85,6 +86,7 @@ if [ -n "$1" ]; then --) no_more_args=1 ;; --cores) fetch_cores="$libretro_cores" ;; --devkit) fetch_devkits="$libretro_devkits" ;; + --lutro) fetch_lutros="$libretro_lutros" ;; --players) fetch_players="$libretro_players" ;; --retroarch) fetch_players="retroarch" ;; *) ;; @@ -108,6 +110,10 @@ for a in $fetch_players; do libretro_fetch "${a%%:*}" done +for a in $fetch_lutros; do + libretro_fetch "${a%%:*}" +done + for a in $fetch_devkits; do libretro_fetch "${a%%:*}" done diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh index cd54f7bf..ba45c14a 100644 --- a/rules.d/core-rules.sh +++ b/rules.d/core-rules.sh @@ -470,44 +470,6 @@ libretro_lutro_name="Lutro" libretro_lutro_git_url="https://github.com/libretro/libretro-lutro.git" libretro_lutro_build_makefile="Makefile" -## TODO: The lutro modules here aren't really "cores", they're assets -## Figure out where to put them and what to do with them. - -register_module core "lutro_sienna" any -libretro_lutro_sienna_name="Lutro-Sienna" -libretro_lutro_sienna_git_url="https://github.com/libretro/lutro-sienna.git" -libretro_lutro_sienna_build_rule=none - -register_module core "lutro_platformer" any -libretro_lutro_platformer_name="Lutro-Platformer" -libretro_lutro_platformer_git_url="https://github.com/libretro/lutro-platformer.git" -libretro_lutro_platformer_build_rule=none - -register_module core "lutro_pong" any -libretro_lutro_pong_name="Lutro-Pong" -libretro_lutro_pong_git_url="https://github.com/libretro/lutro-pong.git" -libretro_lutro_pong_build_rule=none - -register_module core "lutro_tetris" any -libretro_lutro_tetris_name="Lutro-tetris" -libretro_lutro_tetris_git_url="https://github.com/libretro/lutro-tetris.git" -libretro_lutro_tetris_build_rule=none - -register_module core "lutro_snake" any -libretro_lutro_snake_name="Lutro-snake" -libretro_lutro_snake_git_url="https://github.com/libretro/lutro-snake.git" -libretro_lutro_snake_build_rule=none - -register_module core "lutro_iyfct" any -libretro_lutro_iyfct_name="Lutro-iyfct" -libretro_lutro_iyfct_git_url="https://github.com/libretro/lutro-iyfct.git" -libretro_lutro_iyfct_build_rule=none - -register_module core "lutro_game_of_life" any -libretro_lutro_game_of_life_name="Lutro-Game-of-Life" -libretro_lutro_game_of_life_git_url="https://github.com/libretro/lutro-game-of-life.git" -libretro_lutro_game_of_life_build_rule=none - # CORE RULE VARIABLES # # All variables follow the format of libretro__ where is diff --git a/rules.d/lutro-rules.sh b/rules.d/lutro-rules.sh new file mode 100644 index 00000000..e8212b1c --- /dev/null +++ b/rules.d/lutro-rules.sh @@ -0,0 +1,36 @@ +# vim: set ts=3 sw=3 noet ft=sh : bash + +register_module lutro "lutro_sienna" any +libretro_lutro_sienna_name="Lutro-Sienna" +libretro_lutro_sienna_git_url="https://github.com/libretro/lutro-sienna.git" +libretro_lutro_sienna_build_rule=none + +register_module lutro "lutro_platformer" any +libretro_lutro_platformer_name="Lutro-Platformer" +libretro_lutro_platformer_git_url="https://github.com/libretro/lutro-platformer.git" +libretro_lutro_platformer_build_rule=none + +register_module lutro "lutro_pong" any +libretro_lutro_pong_name="Lutro-Pong" +libretro_lutro_pong_git_url="https://github.com/libretro/lutro-pong.git" +libretro_lutro_pong_build_rule=none + +register_module lutro "lutro_tetris" any +libretro_lutro_tetris_name="Lutro-tetris" +libretro_lutro_tetris_git_url="https://github.com/libretro/lutro-tetris.git" +libretro_lutro_tetris_build_rule=none + +register_module lutro "lutro_snake" any +libretro_lutro_snake_name="Lutro-snake" +libretro_lutro_snake_git_url="https://github.com/libretro/lutro-snake.git" +libretro_lutro_snake_build_rule=none + +register_module lutro "lutro_iyfct" any +libretro_lutro_iyfct_name="Lutro-iyfct" +libretro_lutro_iyfct_git_url="https://github.com/libretro/lutro-iyfct.git" +libretro_lutro_iyfct_build_rule=none + +register_module lutro "lutro_game_of_life" any +libretro_lutro_game_of_life_name="Lutro-Game-of-Life" +libretro_lutro_game_of_life_git_url="https://github.com/libretro/lutro-game-of-life.git" +libretro_lutro_game_of_life_build_rule=none diff --git a/script-modules/module_base.sh b/script-modules/module_base.sh index 55fc71a7..3831fdec 100644 --- a/script-modules/module_base.sh +++ b/script-modules/module_base.sh @@ -6,7 +6,7 @@ register_module() { shift 2 case "$mod_type" in - core|devkit|player) + core|devkit|player|lutro) if [ -n "$mod_name" ]; then build_plats="" skip_plats=""