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 @@ /usr/local/bin/dosbox-staging + + + + /Applications/dosbox-x.app/Contents/MacOS/DosBox + /opt/homebrew/bin/dosbox-x + /usr/local/bin/dosbox-x + + 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 @@ DOS (PC) %ROMPATH%/dos .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.dylib %ROM% %EMULATOR_DOSBOX-STAGING% %ROM% + %EMULATOR_DOSBOX-X% %ROM% dos dos @@ -888,10 +889,11 @@ IBM PC %ROMPATH%/pc .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.dylib %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.dylib %ROM% %EMULATOR_DOSBOX-STAGING% %ROM% + %EMULATOR_DOSBOX-X% %ROM% pc pc 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 @@ ~/.local/share/flatpak/exports/bin/io.github.dosbox-staging + + + + dosbox-x + com.dosbox_x.DOSBox-X + + + /var/lib/flatpak/exports/bin/com.dosbox_x.DOSBox-X + ~/.local/share/flatpak/exports/bin/com.dosbox_x.DOSBox-X + + 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 @@ DOS (PC) %ROMPATH%/dos .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM% %EMULATOR_DOSBOX-STAGING% %ROM% + %EMULATOR_DOSBOX-X% %ROM% dos dos @@ -893,10 +894,11 @@ IBM PC %ROMPATH%/pc .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM% %EMULATOR_DOSBOX-STAGING% %ROM% + %EMULATOR_DOSBOX-X% %ROM% pc pc 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 @@ %ESPATH%\..\dosbox-staging\dosbox.exe + + + + SOFTWARE\DOSBox-X\Path|\dosbox-x.exe + + + dosbox-x.exe + + + %ESPATH%\DOSBox-X\dosbox-x.exe + %ESPATH%\Emulators\DOSBox-X\dosbox-x.exe + %ESPATH%\..\DOSBox-X\dosbox-x.exe + + 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 @@ %ESPATH%\..\dosbox-staging\dosbox.exe + + + + %ESPATH%\DOSBox-X\dosbox-x.exe + %ESPATH%\Emulators\DOSBox-X\dosbox-x.exe + %ESPATH%\..\DOSBox-X\dosbox-x.exe + + 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 @@ DOS (PC) %ROMPATH%\dos .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_pure_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_svn_libretro.dll %ROM% %EMULATOR_DOSBOX-STAGING% %ROM% + %EMULATOR_DOSBOX-X% %ROM% dos dos @@ -890,10 +891,11 @@ IBM PC %ROMPATH%\pc .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_pure_libretro.dll %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_core_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\dosbox_svn_libretro.dll %ROM% %EMULATOR_DOSBOX-STAGING% %ROM% + %EMULATOR_DOSBOX-X% %ROM% pc pc