From 5ce95319de419af445c9bfefe5a65b90ce6fe6f2 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Thu, 11 Aug 2022 13:42:28 +0200
Subject: [PATCH] Added ares standalone as an alternative emulator for the
 atari2600, famicom, fds, genesis, megadrive and nes systems.

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

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index ed2a30c76..2d71e2ca3 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -2,7 +2,7 @@ EmulationStation Desktop Edition (ES-DE) - Portable installation on Windows
 ---------------------------------------------------------------------------
 
 ES-DE release:
-1.2.6
+2.0.0
 
 Instructions:
 
@@ -27,6 +27,7 @@ Emulators\RetroArch-Win64\retroarch.exe
 Emulators\RetroArch\retroarch.exe
 Emulators\AppleWin\AppleWin.exe
 Emulators\ArcadeFlashWeb\ArcadeFlashWeb.exe
+Emulators\ares\ares.exe
 Emulators\atari800\atari800.exe
 Emulators\BasiliskII\BasiliskII.exe
 Emulators\bsnes\bsnes.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 23f134bf7..a89eaedd5 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -27,6 +27,12 @@
             <entry>/Applications/AetherSX2.app/Contents/MacOS/AetherSX2</entry>
         </rule>
     </emulator>
+    <emulator name="ARES">
+        <!-- Multi-system emulator ares -->
+        <rule type="staticpath">
+            <entry>/Applications/ares.app/Contents/MacOS/ares</entry>
+        </rule>
+    </emulator>
     <emulator name="ATARI800">
         <!-- Atari 8-bit computer emulator Atari800 -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index f4f4d5803..dd1ee063b 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -131,6 +131,7 @@
         <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="Stella">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.dylib %ROM%</command>
         <command label="Stella 2014">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella2014_libretro.dylib %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Atari 2600" --fullscreen</command>
         <platform>atari2600</platform>
         <theme>atari2600</theme>
     </system>
@@ -422,6 +423,8 @@
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.dylib %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.dylib %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom" --fullscreen</command>
+        <command label="ares FDS (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>famicom</platform>
         <theme>famicom</theme>
     </system>
@@ -456,6 +459,7 @@
         <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.dylib %ROM%</command>
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.dylib %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>fds</platform>
         <theme>fds</theme>
     </system>
@@ -569,6 +573,7 @@
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM%</command>
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.dylib %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Mega Drive" --fullscreen</command>
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
@@ -718,6 +723,7 @@
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.dylib %ROM%</command>
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.dylib %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Mega Drive" --fullscreen</command>
         <platform>megadrive</platform>
         <theme>megadrive</theme>
     </system>
@@ -930,6 +936,8 @@
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.dylib %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.dylib %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom" --fullscreen</command>
+        <command label="ares FDS (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>nes</platform>
         <theme>nes</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 3616bb791..f2346629d 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -42,6 +42,17 @@
             <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
+    <emulator name="ARES">
+        <!-- Multi-system emulator ares -->
+        <rule type="systempath">
+            <entry>ares</entry>
+            <entry>dev.ares.ares</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/dev.ares.ares</entry>
+            <entry>~/.local/share/flatpak/exports/bin/dev.ares.ares</entry>
+        </rule>
+    </emulator>
     <emulator name="ATARI800">
         <!-- Atari 8-bit computer emulator Atari800 -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index e3cefd793..65dcf1ee9 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -133,6 +133,7 @@
         <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="Stella">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.so %ROM%</command>
         <command label="Stella 2014">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella2014_libretro.so %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Atari 2600" --fullscreen</command>
         <platform>atari2600</platform>
         <theme>atari2600</theme>
     </system>
@@ -427,6 +428,8 @@
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom" --fullscreen</command>
+        <command label="ares FDS (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>famicom</platform>
         <theme>famicom</theme>
     </system>
@@ -462,6 +465,7 @@
         <command label="Nestopia UE (Standalone)">%EMULATOR_NESTOPIA-UE% --fullscreen %ROM%</command>
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>fds</platform>
         <theme>fds</theme>
     </system>
@@ -578,6 +582,7 @@
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM%</command>
         <command label="BlastEm (Standalone)">%EMULATOR_BLASTEM% -m gen %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Mega Drive" --fullscreen</command>
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
@@ -729,6 +734,7 @@
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM%</command>
         <command label="BlastEm (Standalone)">%EMULATOR_BLASTEM% -m gen %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Mega Drive" --fullscreen</command>
         <platform>megadrive</platform>
         <theme>megadrive</theme>
     </system>
@@ -946,6 +952,8 @@
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom" --fullscreen</command>
+        <command label="ares FDS (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>nes</platform>
         <theme>nes</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 0d6a6afc4..6ea0f4c2a 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -66,6 +66,17 @@
             <entry>%ESPATH%\..\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ARES">
+        <!-- Multi-system emulator ares -->
+        <rule type="systempath">
+            <entry>ares.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\ares\ares.exe</entry>
+            <entry>%ESPATH%\ares\ares.exe</entry>
+            <entry>%ESPATH%\..\ares\ares.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="ATARI800">
         <!-- Atari 8-bit computer emulator Atari800 -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 8c2ecb5f8..ba76dec47 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%\..\ArcadeFlashWeb\ArcadeFlashWeb.exe</entry>
         </rule>
     </emulator>
+    <emulator name="ARES">
+        <!-- Multi-system emulator ares -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\ares\ares.exe</entry>
+            <entry>%ESPATH%\ares\ares.exe</entry>
+            <entry>%ESPATH%\..\ares\ares.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="ATARI800">
         <!-- Atari 8-bit computer emulator Atari800 -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 8a6dc59be..03ed538d3 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -136,6 +136,7 @@
         <extension>.a26 .A26 .bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="Stella">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\stella_libretro.dll %ROM%</command>
         <command label="Stella 2014">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\stella2014_libretro.dll %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Atari 2600" --fullscreen</command>
         <platform>atari2600</platform>
         <theme>atari2600</theme>
     </system>
@@ -429,6 +430,8 @@
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fceumm_libretro.dll %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quicknes_libretro.dll %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom" --fullscreen</command>
+        <command label="ares FDS (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>famicom</platform>
         <theme>famicom</theme>
     </system>
@@ -463,6 +466,7 @@
         <command label="Nestopia UE">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM%</command>
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fceumm_libretro.dll %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>fds</platform>
         <theme>fds</theme>
     </system>
@@ -577,6 +581,7 @@
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM%</command>
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\blastem_libretro.dll %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Mega Drive" --fullscreen</command>
         <platform>genesis</platform>
         <theme>genesis</theme>
     </system>
@@ -731,6 +736,7 @@
         <command label="PicoDrive">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\picodrive_libretro.dll %ROM%</command>
         <command label="BlastEm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\blastem_libretro.dll %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module md %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Mega Drive" --fullscreen</command>
         <platform>megadrive</platform>
         <theme>megadrive</theme>
     </system>
@@ -947,6 +953,8 @@
         <command label="FCEUmm">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fceumm_libretro.dll %ROM%</command>
         <command label="QuickNES">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\quicknes_libretro.dll %ROM%</command>
         <command label="Mednafen (Standalone)">%EMULATOR_MEDNAFEN% -force_module nes %ROM%</command>
+        <command label="ares (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom" --fullscreen</command>
+        <command label="ares FDS (Standalone)">%EMULATOR_ARES% %ROM% --system "Famicom Disk System" --fullscreen</command>
         <platform>nes</platform>
         <theme>nes</theme>
     </system>