diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index dead8b941..7b22abb0f 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -39,6 +39,7 @@ Emulators\cemu\Cemu.exe Emulators\Citra\canary-mingw\citra-qt.exe Emulators\Citra\nightly-mingw\citra-qt.exe Emulators\cpcemu\cpcemu.exe +Emulators\CSpect\CSpect.exe Emulators\Cxbx-Reloaded\cxbx.exe Emulators\Dolphin-x64\Dolphin.exe Emulators\dosbox-staging\dosbox.exe @@ -103,3 +104,4 @@ Emulators\xemu\xemu.exe Emulators\xenia\xenia.exe Emulators\xroar\xroar.exe Emulators\yuzu\yuzu-windows-msvc\yuzu.exe +Emulators\ZEsarUX\zesarux.exe diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 9e8c31ee5..d556fee2a 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -147,6 +147,7 @@ namespace PlatformIds "xbox360", // Microsoft Xbox 360 "zmachine", // Infocom Z-machine "zx81", // Sinclair ZX81 + "zxnext", // Sinclair ZX Spectrum Next "zxspectrum", // Sinclair ZX Spectrum "ignore", // Do not allow scraping for this system. diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 6ca0301e0..079d5b687 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -146,6 +146,7 @@ namespace PlatformIds MICROSOFT_XBOX_360, GAMEENGINE_Z_MACHINE, SINCLAIR_ZX81_SINCLAR, + SINCLAIR_ZX_SPECTRUM_NEXT, SINCLAIR_ZX_SPECTRUM, PLATFORM_IGNORE, // Do not allow scraping for this system. diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml index 2b1aa3375..ea2e646d7 100644 --- a/resources/systems/macos/es_find_rules.xml +++ b/resources/systems/macos/es_find_rules.xml @@ -340,4 +340,10 @@ /Applications/XRoar.app/Contents/MacOS/xroar + + + + /Applications/ZEsarUX.app/Contents/MacOS/zesarux + + \ No newline at end of file diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index 051d3ad7a..aa5b48b42 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -1832,6 +1832,15 @@ zx81 zx81 + + zxnext + Sinclair ZX Spectrum Next + %ROMPATH%/zxnext + .nex .NEX .sna .SNA + %STARTDIR%=%EMUDIR% %EMULATOR_ZESARUX% --machine tbblue --realvideo --enabletimexvideo --tbblue-fast-boot-mode --enable-esxdos-handler --esxdos-root-dir %GAMEDIR% %ROM% + zxnext + zxnext + zxspectrum Sinclair ZX Spectrum diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index 503c402e7..14de3067d 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -133,6 +133,14 @@ ~/bin/cpcemu/cpcemu + + + + ~/Applications/CSpect/CSpect.exe + ~/.local/bin/CSpect/CSpect.exe + ~/bin/CSpect/CSpect.exe + + @@ -791,4 +799,15 @@ ~/bin/yuzu*.AppImage + + + + zesarux + + + ~/Applications/ZEsarUX/zesarux + ~/.local/bin/ZEsarUX/zesarux + ~/bin/ZEsarUX/zesarux + + \ No newline at end of file diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 9c2feec42..157c371c9 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -1890,6 +1890,16 @@ zx81 zx81 + + zxnext + Sinclair ZX Spectrum Next + %ROMPATH%/zxnext + .nex .NEX .sna .SNA + %STARTDIR%=%GAMEDIR% MONO_IOMAP=all mono %EMULATOR_CSPECT% -fullscreen -s28 -vsync -60 -analytics -tv -zxnext -mmc=./ %ROM% + %STARTDIR%=%EMUDIR% %EMULATOR_ZESARUX% --machine tbblue --realvideo --enabletimexvideo --tbblue-fast-boot-mode --enable-esxdos-handler --esxdos-root-dir %GAMEDIR% %ROM% + zxnext + zxnext + zxspectrum Sinclair ZX Spectrum diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index 3dfd2737a..ae4e8e99c 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -162,6 +162,17 @@ %ESPATH%\..\cpcemu\cpcemu.exe + + + + CSpect.exe + + + %ESPATH%\Emulators\CSpect\CSpect.exe + %ESPATH%\CSpect\CSpect.exe + %ESPATH%\..\CSpect\CSpect.exe + + @@ -874,4 +885,15 @@ %ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe + + + + zesarux.exe + + + %ESPATH%\Emulators\ZEsarUX\zesarux.exe + %ESPATH%\ZEsarUX\zesarux.exe + %ESPATH%\..\ZEsarUX\zesarux.exe + + \ No newline at end of file diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index b46231b98..4c1fd9acf 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -106,6 +106,14 @@ %ESPATH%\..\cpcemu\cpcemu.exe + + + + %ESPATH%\Emulators\CSpect\CSpect.exe + %ESPATH%\CSpect\CSpect.exe + %ESPATH%\..\CSpect\CSpect.exe + + @@ -609,4 +617,12 @@ %ESPATH%\..\yuzu\yuzu-windows-msvc\yuzu.exe + + + + %ESPATH%\Emulators\ZEsarUX\zesarux.exe + %ESPATH%\ZEsarUX\zesarux.exe + %ESPATH%\..\ZEsarUX\zesarux.exe + + \ No newline at end of file diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 576d22a5d..46a410837 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -1893,6 +1893,16 @@ zx81 zx81 + + zxnext + Sinclair ZX Spectrum Next + %ROMPATH%\zxnext + .nex .NEX .sna .SNA + %STARTDIR%=%GAMEDIR% %EMULATOR_CSPECT% -fullscreen -s28 -vsync -60 -analytics -tv -zxnext -mmc=.\ %ROM% + %STARTDIR%=%EMUDIR% %EMULATOR_ZESARUX% --machine tbblue --realvideo --enabletimexvideo --tbblue-fast-boot-mode --enable-esxdos-handler --esxdos-root-dir %GAMEDIR% %ROM% + zxnext + zxnext + zxspectrum Sinclair ZX Spectrum