From 7aa1b1bf5d02b37260e8afd241b9552e1267ed1b Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 12 Sep 2022 19:11:39 +0200 Subject: [PATCH] Added openMSX standalone as an alternative emulator for the msx, msx1, msx2 and msxturbor systems. --- es-app/assets/Windows_Portable_README.txt | 1 + resources/systems/macos/es_find_rules.xml | 8 ++++++++ resources/systems/macos/es_systems.xml | 18 +++++++++++++----- resources/systems/unix/es_find_rules.xml | 10 ++++++++++ resources/systems/unix/es_systems.xml | 18 +++++++++++++----- resources/systems/windows/es_find_rules.xml | 11 +++++++++++ .../systems/windows/es_find_rules_portable.xml | 8 ++++++++ resources/systems/windows/es_systems.xml | 18 +++++++++++++----- 8 files changed, 77 insertions(+), 15 deletions(-) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 52001863e..53861a2c5 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -51,6 +51,7 @@ Emulators\mednafen\mednafen.exe Emulators\melonDS\melonDS.exe Emulators\mGBA\mGBA.exe Emulators\mupen64plus\mupen64plus-ui-console.exe +Emulators\openMSX\openmsx.exe Emulators\Oricutron\oricutron.exe Emulators\PCSX2\pcsx2.exe Emulators\PCSX2-Qt\pcsx2-qtx64.exe diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml index 34de2a274..524812b45 100644 --- a/resources/systems/macos/es_find_rules.xml +++ b/resources/systems/macos/es_find_rules.xml @@ -151,6 +151,14 @@ /usr/local/bin/mupen64plus + + + + /Applications/openMSX.app/Contents/MacOS/openmsx + /opt/homebrew/bin/openmsx + /usr/local/bin/openmsx + + diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index 36f171ece..e5caafda3 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -794,9 +794,11 @@ msx MSX %ROMPATH%/msx - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.dylib %ROM% + %EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX" %ROM% msx msx @@ -805,9 +807,11 @@ msx1 MSX1 %ROMPATH%/msx1 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.dylib %ROM% + %EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX" %ROM% msx msx1 @@ -816,9 +820,11 @@ msx2 MSX2 %ROMPATH%/msx2 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.dylib %ROM% + %EMULATOR_OPENMSX% -machine Panasonic_FS-A1WSX %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX2" %ROM% msx2 msx2 @@ -827,8 +833,10 @@ msxturbor MSX Turbo R %ROMPATH%/msxturbor - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM% + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.dylib %ROM% + %EMULATOR_OPENMSX% -machine Panasonic_FS-A1GT %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% msxturbor msxturbor diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index 4b314bc57..f6f0bed51 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -331,6 +331,16 @@ ~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia + + + + openmsx + + + /var/lib/flatpak/exports/bin/org.openmsx.openMSX + ~/.local/share/flatpak/exports/bin/org.openmsx.openMSX + + diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 5670c5f40..dc99da78a 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -806,9 +806,11 @@ msx MSX %ROMPATH%/msx - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + %EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX" %ROM% msx msx @@ -817,9 +819,11 @@ msx1 MSX1 %ROMPATH%/msx1 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + %EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX" %ROM% msx msx1 @@ -828,9 +832,11 @@ msx2 MSX2 %ROMPATH%/msx2 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + %EMULATOR_OPENMSX% -machine Panasonic_FS-A1WSX %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX2" %ROM% msx2 msx2 @@ -839,8 +845,10 @@ msxturbor MSX Turbo R %ROMPATH%/msxturbor - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + %EMULATOR_OPENMSX% -machine Panasonic_FS-A1GT %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% msxturbor msxturbor diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index a2666e9ac..8cde7d7dd 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -339,6 +339,17 @@ %ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe + + + + openmsx.exe + + + %ESPATH%\Emulators\openMSX\openmsx.exe + %ESPATH%\openMSX\openmsx.exe + %ESPATH%\..\openMSX\openmsx.exe + + diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index a6f77dbbc..4cc1b22b1 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -232,6 +232,14 @@ %ESPATH%\..\mupen64plus\mupen64plus-ui-console.exe + + + + %ESPATH%\Emulators\openMSX\openmsx.exe + %ESPATH%\openMSX\openmsx.exe + %ESPATH%\..\openMSX\openmsx.exe + + diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 2bb3d035a..cdd6f5ade 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -810,9 +810,11 @@ msx MSX %ROMPATH%\msx - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fmsx_libretro.dll %ROM% + %EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX" %ROM% msx msx @@ -821,9 +823,11 @@ msx1 MSX1 %ROMPATH%\msx1 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fmsx_libretro.dll %ROM% + %EMULATOR_OPENMSX% -machine National_CF-3300 %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX" %ROM% msx msx1 @@ -832,9 +836,11 @@ msx2 MSX2 %ROMPATH%\msx2 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fmsx_libretro.dll %ROM% + %EMULATOR_OPENMSX% -machine Panasonic_FS-A1WSX %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% %EMULATOR_ARES% --fullscreen --system "MSX2" %ROM% msx2 msx2 @@ -843,8 +849,10 @@ msxturbor MSX Turbo R %ROMPATH%\msxturbor - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM% + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\bluemsx_libretro.dll %ROM% + %EMULATOR_OPENMSX% -machine Panasonic_FS-A1GT %INJECT%=%BASENAME%.commands %ROM% + %EMULATOR_OPENMSX% %INJECT%=%BASENAME%.commands %ROM% msxturbor msxturbor