From 59dd4c58d5797238edcecc8a493d107fd54c8bef Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 11 Nov 2024 23:16:06 +0100 Subject: [PATCH] Added Mandarine standalone as an alternative emulator for the n3ds system --- es-app/assets/Windows_Portable_README.txt | 1 + resources/systems/android/es_find_rules.xml | 6 ++++++ resources/systems/android/es_systems.xml | 1 + resources/systems/linux/es_find_rules.xml | 12 ++++++++++++ resources/systems/linux/es_systems.xml | 1 + resources/systems/macos/es_find_rules.xml | 6 ++++++ resources/systems/macos/es_systems.xml | 1 + resources/systems/unix/es_find_rules.xml | 6 ++++++ resources/systems/unix/es_systems.xml | 1 + resources/systems/windows/es_find_rules.xml | 10 ++++++++++ resources/systems/windows/es_find_rules_portable.xml | 7 +++++++ resources/systems/windows/es_systems.xml | 1 + 12 files changed, 53 insertions(+) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 93d6e8cf4..739639695 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -87,6 +87,7 @@ Emulators\KEmulator\KEmulator.exe Emulators\lime3ds\lime3ds.exe Emulators\m2emulator\EMULATOR.EXE Emulators\mame\mame.exe +Emulators\mandarine\mandarine-qt.exe Emulators\mednafen\mednafen.exe Emulators\melonDS\melonDS.exe Emulators\Mesen\Mesen.exe diff --git a/resources/systems/android/es_find_rules.xml b/resources/systems/android/es_find_rules.xml index 2473bd811..4e0d86356 100644 --- a/resources/systems/android/es_find_rules.xml +++ b/resources/systems/android/es_find_rules.xml @@ -209,6 +209,12 @@ com.seleuco.mame4d2024/com.seleuco.mame4droid.MAME4droid + + + + io.github.mandarine3ds.mandarine/.activities.EmulationActivity + + diff --git a/resources/systems/android/es_systems.xml b/resources/systems/android/es_systems.xml index 7b3bdbfe4..0bc1643f2 100644 --- a/resources/systems/android/es_systems.xml +++ b/resources/systems/android/es_systems.xml @@ -1113,6 +1113,7 @@ %EMULATOR_CITRA% %ACTIVITY_CLEAR_TASK% %ACTIVITY_CLEAR_TOP% %DATA%=%ROMSAF% %EMULATOR_CITRA-CANARY% %ACTIVITY_CLEAR_TASK% %ACTIVITY_CLEAR_TOP% %DATA%=%ROMSAF% %EMULATOR_CITRA-MMJ% %EXTRA_GamePath%=%ROM% + %EMULATOR_MANDARINE% %ACTIVITY_CLEAR_TASK% %ACTIVITY_CLEAR_TOP% %DATA%=%ROMSAF% %EMULATOR_LIME3DS% %ACTIVITY_CLEAR_TASK% %ACTIVITY_CLEAR_TOP% %DATA%=%ROMSAF% %EMULATOR_PANDA3DS% %DATA%=%ROMPROVIDER% n3ds diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml index f0ce91936..f2734a76a 100644 --- a/resources/systems/linux/es_find_rules.xml +++ b/resources/systems/linux/es_find_rules.xml @@ -559,6 +559,18 @@ ~/.local/share/flatpak/exports/bin/org.mamedev.MAME + + + + mandarine-qt + + + ~/Applications/mandarine-qt.AppImage + ~/.local/share/applications/mandarine-qt.AppImage + ~/.local/bin/mandarine-qt.AppImage + ~/bin/mandarine-qt.AppImage + + diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml index 6eb98d268..d332b9f94 100644 --- a/resources/systems/linux/es_systems.xml +++ b/resources/systems/linux/es_systems.xml @@ -1237,6 +1237,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM% %EMULATOR_CITRA% %ROM% + %EMULATOR_MANDARINE% %ROM% %EMULATOR_LIME3DS% %ROM% %EMULATOR_PANDA3DS% %ROM% n3ds diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml index 4033348e8..9d8721d80 100644 --- a/resources/systems/macos/es_find_rules.xml +++ b/resources/systems/macos/es_find_rules.xml @@ -181,6 +181,12 @@ /usr/local/bin/mame + + + + /Applications/mandarine-qt.app/Contents/MacOS/mandarine-qt + + diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index 2143ef820..5f6a3e680 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -1170,6 +1170,7 @@ %ROMPATH%/n3ds .3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP %EMULATOR_CITRA% %ROM% + %EMULATOR_MANDARINE% %ROM% %EMULATOR_LIME3DS% %ROM% %EMULATOR_PANDA3DS% %ROM% n3ds diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index 5cb70b68f..6c58d1227 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -283,6 +283,12 @@ mame + + + + mandarine-qt + + diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 23cfd4280..cef1049b7 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -1206,6 +1206,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM% %EMULATOR_CITRA% %ROM% + %EMULATOR_MANDARINE% %ROM% %EMULATOR_LIME3DS% %ROM% %EMULATOR_PANDA3DS% %ROM% n3ds diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index 315aa56f9..4c1820f9c 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -478,6 +478,16 @@ %ESPATH%\..\Emulators\mame\mame.exe + + + + mandarine-qt.exe + + + %ESPATH%\Emulators\mandarine\mandarine-qt.exe + %ESPATH%\..\Emulators\mandarine\mandarine-qt.exe + + diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index 9a72359bb..46caa025c 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -320,6 +320,13 @@ %ESPATH%\..\Emulators\mame\mame.exe + + + + %ESPATH%\Emulators\mandarine\mandarine-qt.exe + %ESPATH%\..\Emulators\mandarine\mandarine-qt.exe + + diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index fb2c4685a..bccf539b8 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -1230,6 +1230,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra2018_libretro.dll %ROM% %EMULATOR_CITRA% %ROM% + %EMULATOR_MANDARINE% %ROM% %EMULATOR_LIME3DS% %ROM% %EMULATOR_PANDA3DS% %ROM% n3ds