From b93b040074fc36b8cffbb2c976ae63bee523eff6 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 16 Dec 2022 19:12:41 +0100
Subject: [PATCH] Updated configuration for the SameBoy emulator for the gb and
 gbc systems.

---
 es-app/assets/Windows_Portable_README.txt            | 1 +
 resources/systems/macos/es_find_rules.xml            | 6 ++----
 resources/systems/macos/es_systems.xml               | 4 ++--
 resources/systems/unix/es_find_rules.xml             | 4 +---
 resources/systems/windows/es_find_rules.xml          | 2 +-
 resources/systems/windows/es_find_rules_portable.xml | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 1145b7efc..a076e16d0 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -69,6 +69,7 @@ Emulators\RMG\RMG.exe
 Emulators\RPCS3\rpcs3.exe
 Emulators\ruffle\ruffle.exe
 Emulators\ryujinx\Ryujinx.exe
+Emulators\sameboy\sameboy.exe
 Emulators\scummvm\scummvm.exe
 Emulators\sdl2trs\sdl2trs64.exe
 Emulators\SheepShaver\SheepShaver.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 88a4831cf..d1d0139d1 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -223,11 +223,9 @@
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
-        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
         <rule type="staticpath">
-            <entry>/Applications/sameboy</entry>
-            <entry>/opt/homebrew/bin/sameboy</entry>
-            <entry>/usr/local/bin/sameboy</entry>
+            <entry>/Applications/SameBoy.app/Contents/MacOS/SameBoy</entry>
         </rule>
     </emulator>
     <emulator name="SIMCOUPE">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 8613cf6c8..fa5fe51ac 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -516,7 +516,7 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.dylib %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.dylib %ROM%</command>
-        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command>
+        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% %ROM%</command>
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.dylib %ROM%</command>
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.dylib %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.dylib %ROM%</command>
@@ -549,7 +549,7 @@
         <extension>.bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP</extension>
         <command label="Gambatte">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.dylib %ROM%</command>
         <command label="SameBoy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.dylib %ROM%</command>
-        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% -f %ROM%</command>
+        <command label="SameBoy (Standalone)">%EMULATOR_SAMEBOY% %ROM%</command>
         <command label="Gearboy">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.dylib %ROM%</command>
         <command label="TGB Dual">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.dylib %ROM%</command>
         <command label="Mesen-S">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.dylib %ROM%</command>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 3a5fa4d61..facd18018 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -521,7 +521,7 @@
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
-        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
         <rule type="systempath">
             <entry>sameboy</entry>
             <entry>io.github.sameboy.SameBoy</entry>
@@ -529,8 +529,6 @@
         <rule type="staticpath">
             <entry>/var/lib/flatpak/exports/bin/io.github.sameboy.SameBoy</entry>
             <entry>~/.local/share/flatpak/exports/bin/io.github.sameboy.SameBoy</entry>
-            <entry>~/.local/bin/sameboy</entry>
-            <entry>~/bin/sameboy</entry>
         </rule>
     </emulator>
     <emulator name="SCUMMVM">
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index da2d85dba..b12c04d9b 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -548,7 +548,7 @@
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
-        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
         <rule type="systempath">
             <entry>sameboy.exe</entry>
         </rule>
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index b6c41c72b..237d2a674 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -372,7 +372,7 @@
         </rule>
     </emulator>
     <emulator name="SAMEBOY">
-        <!-- Nintendo Game Boy / Color emulator SameBoy -->
+        <!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
         <rule type="staticpath">
             <entry>%ESPATH%\Emulators\sameboy\sameboy.exe</entry>
             <entry>%ESPATH%\sameboy\sameboy.exe</entry>