diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index f1f55fc70..4c86424c7 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -67,6 +67,7 @@ Emulators\EKA2L1\eka2l1_qt.exe
Emulators\fbneo\fbneo64.exe
Emulators\fbneo\fbneo.exe
Emulators\flycast\flycast.exe
+Emulators\flycast-dojo\flycast.exe
Emulators\FS-UAE\Windows\x86-64\fs-uae.exe
Emulators\FS-UAE-Launcher\Windows\x86-64\fs-uae-launcher.exe
Emulators\Fuse\fuse.exe
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 5dcc96533..5265ea9be 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -121,6 +121,12 @@
/Applications/Flycast.app/Contents/MacOS/Flycast
+
+
+
+ /Applications/Flycast Dojo.app/Contents/MacOS/Flycast Dojo
+
+
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 3a7ce9a97..2a2b9eeea 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -135,6 +135,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%
arcade
arcade
@@ -280,6 +281,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
arcade
atomiswave
@@ -387,6 +389,7 @@
%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/consolearcade %BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_MEDNAFEN% -force_module ss %ROM%
%EMULATOR_PLAY!% --disc %ROM%
%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%
@@ -534,6 +537,7 @@
.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_REDREAM% %ROM%
dreamcast
dreamcast
@@ -923,6 +927,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.dylib %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%
arcade
mame
@@ -1166,6 +1171,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
arcade
naomi
@@ -1176,6 +1182,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
arcade
naomi2
@@ -1186,6 +1193,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.dylib %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
arcade
naomigd
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index a46b9c2db..0cc6c5046 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -336,14 +336,26 @@
org.flycast.Flycast
- ~/Applications/flycast*.AppImage
- ~/.local/share/applications/flycast*.AppImage
- ~/.local/bin/flycast*.AppImage
- ~/bin/flycast*.AppImage
+ ~/Applications/flycast-x86*.AppImage
+ ~/.local/share/applications/flycast-x86*.AppImage
+ ~/.local/bin/flycast-x86*.AppImage
+ ~/bin/flycast-x86*.AppImage
/var/lib/flatpak/exports/bin/org.flycast.Flycast
~/.local/share/flatpak/exports/bin/org.flycast.Flycast
+
+
+
+ flycast-dojo
+
+
+ ~/Applications/flycast-dojo*.AppImage
+ ~/.local/share/applications/flycast-dojo*.AppImage
+ ~/.local/bin/flycast-dojo*.AppImage
+ ~/bin/flycast-dojo*.AppImage
+
+
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index e4e572b69..e8622c1cd 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -137,6 +137,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%
%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM%
%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM%
@@ -289,6 +290,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_DEMUL-WINDOWS% -run=awave -rom=%BASENAME%
%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_DEMUL-WINDOWS% -run=awave -rom=%BASENAME%
arcade
@@ -398,6 +400,7 @@
%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/consolearcade %BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_DEMUL-WINDOWS% -run=naomi -rom=%BASENAME%
%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_DEMUL-WINDOWS% -run=naomi -rom=%BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%
@@ -557,6 +560,7 @@
.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_REDREAM% %ROM%
%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_DEMUL-WINDOWS% -run=dc -image=%ROM%
%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_DEMUL-WINDOWS% -run=dc -image=%ROM%
@@ -968,6 +972,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM%
%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM%
%STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM%
@@ -1223,6 +1228,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_DEMUL-WINDOWS% -run=naomi -rom=%BASENAME%
%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_DEMUL-WINDOWS% -run=naomi -rom=%BASENAME%
arcade
@@ -1235,6 +1241,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_DEMUL-WINDOWS% -run=naomi -rom=%BASENAME%
%STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_DEMUL-WINDOWS% -run=naomi -rom=%BASENAME%
arcade
@@ -1247,6 +1254,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
arcade
naomigd
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index bf4fd3961..b48c3f9ef 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -288,6 +288,17 @@
%ESPATH%\..\Emulators\flycast\flycast.exe
+
+
+
+ flycast-dojo.exe
+ flycast.exe
+
+
+ %ESPATH%\Emulators\flycast-dojo\flycast.exe
+ %ESPATH%\..\Emulators\flycast-dojo\flycast.exe
+
+
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index afed34d7c..478f7be58 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -188,6 +188,13 @@
%ESPATH%\..\Emulators\flycast\flycast.exe
+
+
+
+ %ESPATH%\Emulators\flycast-dojo\flycast.exe
+ %ESPATH%\..\Emulators\flycast-dojo\flycast.exe
+
+
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 017ae70a1..117a7056b 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -133,6 +133,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\kronos_libretro.dll %ROM%
%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%
%STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%
@@ -285,6 +286,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_DEMUL% -run=awave -rom=%BASENAME%
arcade
atomiswave
@@ -392,6 +394,7 @@
%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\consolearcade %BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_DEMUL% -run=naomi -rom=%BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\kronos_libretro.dll %ROM%
%EMULATOR_MEDNAFEN% -force_module ss %ROM%
@@ -549,6 +552,7 @@
.chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_REDREAM% %ROM%
%EMULATOR_DEMUL% -run=dc -image=%ROM%
dreamcast
@@ -954,6 +958,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbalpha2012_libretro.dll %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\kronos_libretro.dll %ROM%
%RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%
%STARTDIR%=%EMUDIR% %EMULATOR_M2EMULATOR% %BASENAME%
@@ -1210,6 +1215,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_DEMUL% -run=naomi -rom=%BASENAME%
arcade
naomi
@@ -1221,6 +1227,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
%EMULATOR_DEMUL% -run=naomi -rom=%BASENAME%
arcade
naomi2
@@ -1232,6 +1239,7 @@
.bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\flycast_libretro.dll %ROM%
%EMULATOR_FLYCAST% %ROM%
+ %EMULATOR_FLYCAST-DOJO% %ROM%
arcade
naomigd