From da82106b9f6c0b791d345a92b71d3054a2c2b05b Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sat, 25 May 2024 11:52:14 +0200
Subject: [PATCH] (Linux, macOS, Windows) Added ACE-DL standalone as an
 alternative emulator for the amstradcpc system

---
 es-app/assets/Windows_Portable_README.txt            |  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/windows/es_find_rules.xml          | 10 ++++++++++
 resources/systems/windows/es_find_rules_portable.xml |  7 +++++++
 resources/systems/windows/es_systems.xml             |  1 +
 8 files changed, 39 insertions(+)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 9e3b89813..ca0d86c4b 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -42,6 +42,7 @@ Preconfigured emulator locations:
 Emulators\RetroArch-Win64\retroarch.exe
 Emulators\RetroArch\retroarch.exe
 Emulators\3dSen\3dSen.exe
+Emulators\AceDL\AceDL.exe
 Emulators\AdvanceMAME\advmame.exe
 Emulators\Altirra\Altirra64.exe
 Emulators\Altirra\Altirra.exe
diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml
index 5126183cd..4c7d505f9 100644
--- a/resources/systems/linux/es_find_rules.xml
+++ b/resources/systems/linux/es_find_rules.xml
@@ -52,6 +52,18 @@
             <entry>~/bin/3dSen/3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ACE-DL">
+        <!-- Amstrad CPC emulator ACE-DL -->
+        <rule type="systempath">
+            <entry>AceDL</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/AceDL/AceDL</entry>
+            <entry>~/.local/share/applications/AceDL/AceDL</entry>
+            <entry>~/.local/bin/AceDL/AceDL</entry>
+            <entry>~/bin/AceDL/AceDL</entry>
+        </rule>
+    </emulator>
     <emulator name="ADVANCEMAME">
         <!-- Arcade emulator AdvanceMAME -->
         <rule type="systempath">
diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml
index fc35f3024..1ee125c4b 100644
--- a/resources/systems/linux/es_systems.xml
+++ b/resources/systems/linux/es_systems.xml
@@ -87,6 +87,7 @@
         <command label="Caprice32">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM%</command>
         <command label="CrocoDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.so %ROM%</command>
         <command label="CPCemu (Standalone)">%STARTDIR%=~/.CPCemu %EMULATOR_CPCEMU% %ROM%</command>
+        <command label="ACE-DL (Standalone)">%EMULATOR_ACE-DL% %INJECT%=%BASENAME%.commands %ROM%</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/amstradcpc cpc6128 -flop1 %ROM%</command>
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 9074613ba..485fa4a71 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -21,6 +21,12 @@
             <entry>/Applications/RetroArch.app/Contents/Resources/cores</entry>
         </rule>
     </core>
+    <emulator name="ACE-DL">
+        <!-- Amstrad CPC emulator ACE-DL -->
+        <rule type="staticpath">
+            <entry>/Applications/AceDL.app/Contents/MacOS/AceDL</entry>
+        </rule>
+    </emulator>
     <emulator name="AETHERSX2">
         <!-- Sony PlayStation 2 emulator AetherSX2 -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 640b376a3..94153e818 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -87,6 +87,7 @@
         <command label="Caprice32">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.dylib %ROM%</command>
         <command label="CrocoDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.dylib %ROM%</command>
         <command label="CPCemu (Standalone)">%STARTDIR%="~/Library/Application Support/CPCemu" %EMULATOR_CPCEMU% %ROM%</command>
+        <command label="ACE-DL (Standalone)">%EMULATOR_ACE-DL% %INJECT%=%BASENAME%.commands %ROM%</command>
         <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/amstradcpc cpc6128 -flop1 %ROM%</command>
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index fa8adf0de..353d85377 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -52,6 +52,16 @@
             <entry>%ESPATH%\..\Emulators\3dSen\3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ACE-DL">
+        <!-- Amstrad CPC emulator ACE-DL -->
+        <rule type="systempath">
+            <entry>AceDL.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\AceDL\AceDL.exe</entry>
+            <entry>%ESPATH%\..\Emulators\AceDL\AceDL.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="ADVANCEMAME">
         <!-- Arcade emulator AdvanceMAME -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index a1cfd1d74..982d6c71a 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -28,6 +28,13 @@
             <entry>%ESPATH%\..\Emulators\3dSen\3dSen.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ACE-DL">
+        <!-- Amstrad CPC emulator ACE-DL -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\AceDL\AceDL.exe</entry>
+            <entry>%ESPATH%\..\Emulators\AceDL\AceDL.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="ADVANCEMAME">
         <!-- Arcade emulator AdvanceMAME -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 47b4e2dc2..98d5f1406 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -83,6 +83,7 @@
         <command label="Caprice32">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\cap32_libretro.dll %ROM%</command>
         <command label="CrocoDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\crocods_libretro.dll %ROM%</command>
         <command label="CPCemu (Standalone)">%EMULATOR_CPCEMU% %ROM%</command>
+        <command label="ACE-DL (Standalone)">%EMULATOR_ACE-DL% %INJECT%=%BASENAME%.commands %ROM%</command>
         <command label="MAME (Standalone)">%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\amstradcpc cpc6128 -flop1 %ROM%</command>
         <platform>amstradcpc</platform>
         <theme>amstradcpc</theme>