From 25b0ae02bd177db77b0ccd63398666c3fdbf094c Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 2 Jul 2022 20:33:35 +0200
Subject: [PATCH] Added emulator configuration for the macintosh system.

---
 es-app/assets/Windows_Portable_README.txt     |  2 ++
 resources/systems/macos/es_find_rules.xml     | 12 +++++++++
 resources/systems/macos/es_systems.xml        |  5 ++--
 resources/systems/unix/es_find_rules.xml      | 25 +++++++++++++++++++
 resources/systems/unix/es_systems.xml         |  5 ++--
 resources/systems/windows/es_find_rules.xml   | 22 ++++++++++++++++
 .../windows/es_find_rules_portable.xml        | 16 ++++++++++++
 resources/systems/windows/es_systems.xml      |  5 ++--
 8 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 3f2fe9590..9a7acd0a9 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -25,6 +25,7 @@ Emulators\RetroArch-Win64\retroarch.exe
 Emulators\RetroArch\retroarch.exe
 Emulators\AppleWin\AppleWin.exe
 Emulators\atari800\atari800.exe
+Emulators\BasiliskII\BasiliskII.exe
 Emulators\bsnes\bsnes.exe
 Emulators\cemu\Cemu.exe
 Emulators\Citra\canary-mingw\citra.exe
@@ -52,6 +53,7 @@ Emulators\redream\redream.exe
 Emulators\RPCS3\rpcs3.exe
 Emulators\ryujinx\Ryujinx.exe
 Emulators\scummvm\scummvm.exe
+Emulators\SheepShaver\SheepShaver.exe
 Emulators\snes9x\snes9x-x64.exe
 Emulators\Supermodel\Supermodel.exe
 Emulators\VBA-M\visualboyadvance-m.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 3a41b5b6d..2cf2aab99 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -34,6 +34,12 @@
             <entry>/usr/local/bin/atari800</entry>
         </rule>
     </emulator>
+    <emulator name="BASILISKII">
+        <!-- Macintosh 68k emulator Basilisk II -->
+        <rule type="staticpath">
+            <entry>/Applications/BasiliskII.app/Contents/MacOS/BasiliskII</entry>
+        </rule>
+    </emulator>
     <emulator name="CITRA">
         <!-- Nintendo 3DS emulator Citra -->
         <rule type="staticpath">
@@ -170,6 +176,12 @@
             <entry>/usr/local/bin/scummvm</entry>
         </rule>
     </emulator>
+    <emulator name="SHEEPSHAVER">
+        <!-- Macintosh PowerPC emulator SheepShaver -->
+        <rule type="staticpath">
+            <entry>/Applications/SheepShaver.app/Contents/MacOS/SheepShaver</entry>
+        </rule>
+    </emulator>
     <emulator name="SIXTYFORCE">
         <!-- Nintendo 64 emulator sixtyforce -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index b35337c9a..c51a89524 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -603,8 +603,9 @@
         <name>macintosh</name>
         <fullname>Apple Macintosh</fullname>
         <path>%ROMPATH%/macintosh</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.game .GAME</extension>
+        <command label="Basilisk II (Standalone)">%EMULATOR_BASILISKII% --nogui true</command>
+        <command label="SheepShaver (Standalone)">%EMULATOR_SHEEPSHAVER% --nogui true</command>
         <platform>macintosh</platform>
         <theme>macintosh</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 02a0eb122..6346c3241 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -49,6 +49,20 @@
             <entry>atari800-jz.atari800</entry>
         </rule>
     </emulator>
+    <emulator name="BASILISKII">
+        <!-- Macintosh 68k emulator Basilisk II -->
+        <rule type="systempath">
+            <entry>BasiliskII</entry>
+            <entry>net.cebix.basilisk</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.cebix.basilisk</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.cebix.basilisk</entry>
+            <entry>~/Applications/BasiliskII-x86_64.AppImage</entry>
+            <entry>~/.local/bin/BasiliskII-x86_64.AppImage</entry>
+            <entry>~/bin/BasiliskII-x86_64.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="BLASTEM">
         <!-- Sega Mega Drive/Genesis emulator BlastEm -->
         <rule type="systempath">
@@ -361,6 +375,17 @@
             <entry>~/.local/share/flatpak/exports/bin/org.scummvm.ScummVM</entry>
         </rule>
     </emulator>
+    <emulator name="SHEEPSHAVER">
+        <!-- Macintosh PowerPC emulator SheepShaver -->
+        <rule type="systempath">
+            <entry>SheepShaver</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/SheepShaver-x86_64.AppImage</entry>
+            <entry>~/.local/bin/SheepShaver-x86_64.AppImage</entry>
+            <entry>~/bin/SheepShaver-x86_64.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="SNES9X">
         <!-- Super Nintendo emulator Snes9x -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 2aab92973..f61a91c88 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -609,8 +609,9 @@
         <name>macintosh</name>
         <fullname>Apple Macintosh</fullname>
         <path>%ROMPATH%/macintosh</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.game .GAME</extension>
+        <command label="Basilisk II (Standalone)">%EMULATOR_BASILISKII% --nogui true</command>
+        <command label="SheepShaver (Standalone)">%EMULATOR_SHEEPSHAVER% --nogui true</command>
         <platform>macintosh</platform>
         <theme>macintosh</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 3529dae8f..c674b5890 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -66,6 +66,17 @@
             <entry>%ESPATH%\..\atari800\atari800.exe</entry>
         </rule>
     </emulator>
+    <emulator name="BASILISKII">
+        <!-- Macintosh 68k emulator Basilisk II -->
+        <rule type="systempath">
+            <entry>BasiliskII.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\BasiliskII\BasiliskII.exe</entry>
+            <entry>%ESPATH%\BasiliskII\BasiliskII.exe</entry>
+            <entry>%ESPATH%\..\BasiliskII\BasiliskII.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="BSNES">
         <!-- Super Nintendo/Super Famicom emulator bsnes -->
         <rule type="systempath">
@@ -388,6 +399,17 @@
             <entry>%ESPATH%\..\scummvm\scummvm.exe</entry>
         </rule>
     </emulator>
+    <emulator name="SHEEPSHAVER">
+        <!-- Macintosh PowerPC emulator SheepShaver -->
+        <rule type="systempath">
+            <entry>SheepShaver.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\SheepShaver\SheepShaver.exe</entry>
+            <entry>%ESPATH%\SheepShaver\SheepShaver.exe</entry>
+            <entry>%ESPATH%\..\SheepShaver\SheepShaver.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="SNES9X">
         <!-- Super Nintendo emulator Snes9x -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 6a3d5b0c7..d58bba174 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -39,6 +39,14 @@
             <entry>%ESPATH%\..\atari800\atari800.exe</entry>
         </rule>
     </emulator>
+    <emulator name="BASILISKII">
+        <!-- Macintosh 68k emulator Basilisk II -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\BasiliskII\BasiliskII.exe</entry>
+            <entry>%ESPATH%\BasiliskII\BasiliskII.exe</entry>
+            <entry>%ESPATH%\..\BasiliskII\BasiliskII.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="BSNES">
         <!-- Super Nintendo/Super Famicom emulator bsnes -->
         <rule type="staticpath">
@@ -253,6 +261,14 @@
             <entry>%ESPATH%\..\scummvm\scummvm.exe</entry>
         </rule>
     </emulator>
+    <emulator name="SHEEPSHAVER">
+        <!-- Macintosh PowerPC emulator SheepShaver -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\SheepShaver\SheepShaver.exe</entry>
+            <entry>%ESPATH%\SheepShaver\SheepShaver.exe</entry>
+            <entry>%ESPATH%\..\SheepShaver\SheepShaver.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="SNES9X">
         <!-- Super Nintendo emulator Snes9x -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index e92339127..f84acfc93 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -607,8 +607,9 @@
         <name>macintosh</name>
         <fullname>Apple Macintosh</fullname>
         <path>%ROMPATH%\macintosh</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.game .GAME</extension>
+        <command label="Basilisk II (Standalone)">%EMULATOR_BASILISKII% --nogui true</command>
+        <command label="SheepShaver (Standalone)">%EMULATOR_SHEEPSHAVER% --nogui true</command>
         <platform>macintosh</platform>
         <theme>macintosh</theme>
     </system>