Merge a0b3162926 into 5e0ab1f859

* Update platforms.cfg for pc98 and add .cmd files

platforms.cfg

@@ -140,7 +140,7 @@ moto_fullname="Thomson MO/TO"
 n64_exts=".z64 .n64 .v64 .zip"
 n64_fullname="Nintendo 64"
 
-nds_exts=".nds .zip"
+nds_exts=".3ds .3dsx .7z .app .axf .cci .cxi .nds .zip"
 nds_fullname="Nintendo DS"
 
 neogeo_exts=".7z .chd .cue .fba .iso .zip"
@@ -164,7 +164,7 @@ oric_fullname="Oric 1"
 pc88_exts=".d88 .cmt .m3u .t88"
 pc88_fullname="NEC PC-8801"
 
-pc98_exts=".d88 .d98 .88d .98d .fdi .fdd .xdf .hdm .dup .2hd .tfd .hdi .thd .nhd .hdd .zip"
+pc98_exts=".2hd .88d .98d .cmd .d88 .d98 .dup .fdi .fdd .hdd .hdi .hdm .nhd .thd .tfd .xdf .zip"
 pc98_fullname="NEC PC-9801"
 
 pc_exts=".bat .com .conf .cue .dosz .exe .ins .ima .img .iso .m3u .m3u8 .sh .vhd .zip"

scriptmodules/emulators/mame.sh

@@ -18,6 +18,11 @@ rp_module_section="exp"
 rp_module_flags="!mali !armv6"
 
 function _get_branch_mame() {
+    # starting with 0.265, GCC 10.3 or later is required for full C++17 support
+    if [[ "$__gcc_version" -lt 10 ]]; then
+        echo "mame0264"
+        return
+    fi
     download https://api.github.com/repos/mamedev/mame/releases/latest - | grep -m 1 tag_name | cut -d\" -f4
 }
 

scriptmodules/libretrocores/lr-citra.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# This file is part of The RetroPie Project
+#
+# The RetroPie Project is the legal property of its developers, whose names are
+# too numerous to list here. Please refer to the COPYRIGHT.md file distributed with this source.
+#
+# See the LICENSE.md file at the top-level directory of this distribution and
+# at https://raw.githubusercontent.com/RetroPie/RetroPie-Setup/master/LICENSE.md
+#
+
+rp_module_id="lr-citra"
+rp_module_desc="Nintendo 3DS Emulator - libretro port of Citra"
+rp_module_help="ROM Extensions: .7z .nds .zip\n\nCopy your Nintendo DS roms to $romdir/nds"
+rp_module_licence="GPL2 https://raw.githubusercontent.com/libretro/citra/master/license.txt"
+rp_module_section="exp"
+rp_module_flags="!gles !arm"
+
+function depends_lr-citra() {
+    getDepends cmake
+}
+
+function sources_lr-citra() {
+    gitPullOrClone "$md_build" https://github.com/libretro/citra.git
+}
+
+function build_lr-citra() {
+    mkdir -p build
+    cd build
+    cmake -DENABLE_LIBRETRO=1 -DENABLE_SDL2=0 -DENABLE_QT=0 -DCMAKE_BUILD_TYPE="Release" -DENABLE_WEB_SERVICE=0 --target citra_libretro ..
+    make clean
+    make
+    md_ret_require="$md_build/build/src/citra_libretro/citra_libretro.so"
+}
+
+function install_lr-citra() {
+    md_ret_files=(
+        'build/src/citra_libretro/citra_libretro.so'
+    )
+}
+
+function configure_lr-citra() {
+    mkRomDir "nds"
+    ensureSystemretroconfig "nds"
+
+    addEmulator 0 "$md_id" "nds" "$md_inst/citra_libretro.so"
+    addSystem "nds"
+}

scriptmodules/libretrocores/lr-mame.sh

@@ -13,12 +13,19 @@ rp_module_id="lr-mame"
 rp_module_desc="MAME emulator - MAME (current) port for libretro"
 rp_module_help="ROM Extension: .zip\n\nCopy your MAME roms to either $romdir/mame-libretro or\n$romdir/arcade"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/libretro/mame/master/COPYING"
-rp_module_repo="git https://github.com/libretro/mame.git master"
+rp_module_repo="git https://github.com/libretro/mame.git master :_get_version_lr-mame"
 rp_module_section="exp"
 rp_module_flags=""
 
+function _get_version_lr-mame() {
+    local tagname
+    if [[ "$__gcc_version" -lt 10 ]]; then
+        tagname="lrmame0264"
+    fi
+    echo "$tagname"
+}
 function _get_params_lr-mame() {
-    local params=(OSD=retro RETRO=1 NOWERROR=1 OS=linux OPTIMIZE=2 TARGETOS=linux CONFIG=libretro NO_USE_MIDI=1 NO_USE_PORTAUDIO=1 TARGET=mame)
+    local params=(OSD=retro RETRO=1 PYTHON_EXECUTABLE=python3 NOWERROR=1 OS=linux OPTIMIZE=2 TARGETOS=linux CONFIG=libretro NO_USE_MIDI=1 NO_USE_PORTAUDIO=1 TARGET=mame)
     isPlatform "64bit" && params+=(PTR64=1)
     echo "${params[@]}"
 }

scriptmodules/libretrocores/lr-mess.sh

@@ -13,7 +13,7 @@ rp_module_id="lr-mess"
 rp_module_desc="MESS emulator - MESS Port for libretro"
 rp_module_help="see wiki for detailed explanation"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/libretro/mame/master/COPYING"
-rp_module_repo="git https://github.com/libretro/mame.git master"
+rp_module_repo="git https://github.com/libretro/mame.git master :_get_version_lr-mame"
 rp_module_section="exp"
 rp_module_flags=""