From d835185b65b6a0b67a00d7371bd4cbe5146d11c1 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Fri, 12 Aug 2022 11:18:57 +0200 Subject: [PATCH] Added VICE standalone as an alternative emulator for the c64 system. --- es-app/assets/Windows_Portable_README.txt | 2 ++ resources/systems/macos/es_find_rules.xml | 7 +++++++ resources/systems/macos/es_systems.xml | 1 + resources/systems/unix/es_find_rules.xml | 12 ++++++++++++ resources/systems/unix/es_systems.xml | 1 + resources/systems/windows/es_find_rules.xml | 14 ++++++++++++++ .../systems/windows/es_find_rules_portable.xml | 11 +++++++++++ resources/systems/windows/es_systems.xml | 1 + 8 files changed, 49 insertions(+) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 2d71e2ca3..d879c7b28 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -70,6 +70,8 @@ Emulators\solarus\solarus-run.exe Emulators\Supermodel\Supermodel.exe Emulators\tsugaru\Tsugaru_CUI.exe Emulators\VBA-M\visualboyadvance-m.exe +Emulators\VICE\x64sc.exe +Emulators\VICE\bin\x64sc.exe Emulators\Vita3K\Vita3K.exe Emulators\xemu\xemu.exe Emulators\xenia\xenia.exe diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml index a89eaedd5..b19533cd5 100644 --- a/resources/systems/macos/es_find_rules.xml +++ b/resources/systems/macos/es_find_rules.xml @@ -246,6 +246,13 @@ /Applications/visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m + + + + /opt/homebrew/bin/x64sc + /usr/local/bin/x64sc + + diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index d58a053d9..dee762e62 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -238,6 +238,7 @@ %ROMPATH%/c64 .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.dylib %ROM% + %EMULATOR_VICE-X64SC% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.dylib %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.dylib %ROM% diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index f2346629d..902c19afe 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -514,6 +514,18 @@ visualboyadvance-m + + + + x64sc + vice-jz.x64sc + net.sf.VICE + + + /var/lib/flatpak/exports/bin/net.sf.VICE + ~/.local/share/flatpak/exports/bin/net.sf.VICE + + diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 2c7ae7419..ac73c24ee 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -240,6 +240,7 @@ %ROMPATH%/c64 .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM% + %EMULATOR_VICE-X64SC% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.so %ROM% diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index 6ea0f4c2a..31963b56b 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -568,6 +568,20 @@ %ESPATH%\..\VBA-M\visualboyadvance-m.exe + + + + x64sc.exe + + + %ESPATH%\Emulators\VICE\x64sc.exe + %ESPATH%\VICE\x64sc.exe + %ESPATH%\..\VICE\x64sc.exe + %ESPATH%\Emulators\VICE\bin\x64sc.exe + %ESPATH%\VICE\bin\x64sc.exe + %ESPATH%\..\VICE\bin\x64sc.exe + + diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index ba76dec47..8ab5bd72b 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -389,6 +389,17 @@ %ESPATH%\..\VBA-M\visualboyadvance-m.exe + + + + %ESPATH%\Emulators\VICE\x64sc.exe + %ESPATH%\VICE\x64sc.exe + %ESPATH%\..\VICE\x64sc.exe + %ESPATH%\Emulators\VICE\bin\x64sc.exe + %ESPATH%\VICE\bin\x64sc.exe + %ESPATH%\..\VICE\bin\x64sc.exe + + diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index c27a349cf..4fed09f85 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -243,6 +243,7 @@ %ROMPATH%\c64 .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x64sc_libretro.dll %ROM% + %EMULATOR_VICE-X64SC% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x64_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xscpu64_libretro.dll %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_x128_libretro.dll %ROM%