From 0e1c66ccbb8c4c3ba50ead2e226d2075f10717e2 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Thu, 16 Dec 2021 22:40:43 +0100
Subject: [PATCH] (macOS) Added alternative emulators for the 64dd, n64, dos
 and pc systems.

---
 resources/systems/macos/es_find_rules.xml | 9 ++++++++-
 resources/systems/macos/es_systems.xml    | 7 +++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 63edb198c..665e7ef87 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -15,8 +15,15 @@
         </rule>
     </core>
     <emulator name="DOSBOX_STAGING">
+        <!-- DOS emulator DOSBox Staging, Homebrew version -->
         <rule type="staticpath">
-            <entry>/Applications/dosbox-staging.app/Contents/MacOS/dosbox</entry>
+            <entry>/usr/local/bin/dosbox-staging</entry>
+        </rule>
+    </emulator>
+    <emulator name="MUPEN64PLUS">
+        <!-- Nintendo 64 emulator Mupen64Plus, Homebrew version -->
+        <rule type="staticpath">
+            <entry>/usr/local/bin/mupen64plus</entry>
         </rule>
     </emulator>
 </ruleList>
\ No newline at end of file
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 6553c8d0e..e9e78676f 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -15,7 +15,8 @@
         <fullname>Nintendo 64DD</fullname>
         <path>%ROMPATH%/64dd</path>
         <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.dylib %ROM%</command>
+        <command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.dylib %ROM%</command>
+        <command label="Mupen64Plus (Standalone)">%EMULATOR_MUPEN64PLUS% %ROM%</command>
         <platform>n64</platform>
         <theme>64dd</theme>
     </system>
@@ -336,6 +337,7 @@
         <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM%</command>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.dylib %ROM%</command>
         <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.dylib %ROM%</command>
+        <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX_STAGING% %ROM%</command>
         <platform>dos</platform>
         <theme>dos</theme>
     </system>
@@ -723,7 +725,8 @@
         <fullname>Nintendo 64</fullname>
         <path>%ROMPATH%/n64</path>
         <extension>.n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.dylib %ROM%</command>
+        <command label="ParaLLEl N64">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.dylib %ROM%</command>
+        <command label="Mupen64Plus (Standalone)">%EMULATOR_MUPEN64PLUS% %ROM%</command>
         <platform>n64</platform>
         <theme>n64</theme>
     </system>