From 8fc5e27e5e4b8bf846afd41779508b1f3361aa11 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Tue, 10 May 2022 17:57:12 +0200
Subject: [PATCH] Changed the default emulator for the dos and pc systems from
 DOSBox-Core to DOSBox-Pure.

Also added DOSBox-X standalone as an alternative emulator.
---
 resources/systems/macos/es_find_rules.xml          |  8 ++++++++
 resources/systems/macos/es_systems.xml             |  6 ++++--
 resources/systems/unix/es_find_rules.xml           | 11 +++++++++++
 resources/systems/unix/es_systems.xml              |  6 ++++--
 resources/systems/windows/es_find_rules.xml        | 14 ++++++++++++++
 .../systems/windows/es_find_rules_portable.xml     |  8 ++++++++
 resources/systems/windows/es_systems.xml           |  6 ++++--
 7 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 69f4bf640..55ee43e38 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -49,6 +49,14 @@
             <entry>/usr/local/bin/dosbox-staging</entry>
         </rule>
     </emulator>
+    <emulator name="DOSBOX-X">
+        <!-- DOS emulator DOSBox-X -->
+        <rule type="staticpath">
+            <entry>/Applications/dosbox-x.app/Contents/MacOS/DosBox</entry>
+            <entry>/opt/homebrew/bin/dosbox-x</entry>
+            <entry>/usr/local/bin/dosbox-x</entry>
+        </rule>
+    </emulator>
     <emulator name="DUCKSTATION">
         <!-- Sony PlayStation 1 emulator DuckStation -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index e35ec890a..e62388a68 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -344,10 +344,11 @@
         <fullname>DOS (PC)</fullname>
         <path>%ROMPATH%/dos</path>
         <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <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-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_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>
+        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
         <platform>dos</platform>
         <theme>dos</theme>
     </system>
@@ -888,10 +889,11 @@
         <fullname>IBM PC</fullname>
         <path>%ROMPATH%/pc</path>
         <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <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-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_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>
+        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
         <platform>pc</platform>
         <theme>pc</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index d5e95524c..22167bfe9 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -89,6 +89,17 @@
             <entry>~/.local/share/flatpak/exports/bin/io.github.dosbox-staging</entry>
         </rule>
     </emulator>
+    <emulator name="DOSBOX-X">
+        <!-- DOS emulator DOSBox-X -->
+        <rule type="systempath">
+            <entry>dosbox-x</entry>
+            <entry>com.dosbox_x.DOSBox-X</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/com.dosbox_x.DOSBox-X</entry>
+            <entry>~/.local/share/flatpak/exports/bin/com.dosbox_x.DOSBox-X</entry>
+        </rule>
+    </emulator>
     <emulator name="DUCKSTATION">
         <!-- Sony PlayStation 1 emulator DuckStation -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 0ac20be1c..f8dbd804b 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -344,10 +344,11 @@
         <fullname>DOS (PC)</fullname>
         <path>%ROMPATH%/dos</path>
         <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
+        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
         <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
         <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
+        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
         <platform>dos</platform>
         <theme>dos</theme>
     </system>
@@ -893,10 +894,11 @@
         <fullname>IBM PC</fullname>
         <path>%ROMPATH%/pc</path>
         <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM%</command>
+        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM%</command>
         <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM%</command>
         <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
+        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
         <platform>pc</platform>
         <theme>pc</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index ff6a02888..5ac535815 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -98,6 +98,20 @@
             <entry>%ESPATH%\..\dosbox-staging\dosbox.exe</entry>
         </rule>
     </emulator>
+    <emulator name="DOSBOX-X">
+        <!-- DOS emulator DOSBox-X -->
+        <rule type="winregistryvalue">
+            <entry>SOFTWARE\DOSBox-X\Path|\dosbox-x.exe</entry>
+        </rule>
+        <rule type="systempath">
+            <entry>dosbox-x.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\DOSBox-X\dosbox-x.exe</entry>
+            <entry>%ESPATH%\Emulators\DOSBox-X\dosbox-x.exe</entry>
+            <entry>%ESPATH%\..\DOSBox-X\dosbox-x.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="DUCKSTATION">
         <!-- Sony PlayStation 1 emulator DuckStation -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 3e1c06bd5..3fb2f0ed7 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -60,6 +60,14 @@
             <entry>%ESPATH%\..\dosbox-staging\dosbox.exe</entry>
         </rule>
     </emulator>
+    <emulator name="DOSBOX-X">
+        <!-- DOS emulator DOSBox-X -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\DOSBox-X\dosbox-x.exe</entry>
+            <entry>%ESPATH%\Emulators\DOSBox-X\dosbox-x.exe</entry>
+            <entry>%ESPATH%\..\DOSBox-X\dosbox-x.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="DUCKSTATION">
         <!-- Sony PlayStation 1 emulator DuckStation -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 832f9ed59..7d463dac0 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -344,10 +344,11 @@
         <fullname>DOS (PC)</fullname>
         <path>%ROMPATH%\dos</path>
         <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM%</command>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_pure_libretro.dll %ROM%</command>
+        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM%</command>
         <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_svn_libretro.dll %ROM%</command>
         <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
+        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
         <platform>dos</platform>
         <theme>dos</theme>
     </system>
@@ -890,10 +891,11 @@
         <fullname>IBM PC</fullname>
         <path>%ROMPATH%\pc</path>
         <extension>.bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM%</command>
         <command label="DOSBox-Pure">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_pure_libretro.dll %ROM%</command>
+        <command label="DOSBox-Core">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM%</command>
         <command label="DOSBox-SVN">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_svn_libretro.dll %ROM%</command>
         <command label="DOSBox Staging (Standalone)">%EMULATOR_DOSBOX-STAGING% %ROM%</command>
+        <command label="DOSBox-X (Standalone)">%EMULATOR_DOSBOX-X% %ROM%</command>
         <platform>pc</platform>
         <theme>pc</theme>
     </system>