From e3ca5774854a3e0be2216d945493a9b3e23752ac Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Fri, 12 Aug 2022 13:18:54 +0200
Subject: [PATCH] Added VICE standalone as an alternative emulator for the
 vic20 system.

---
 es-app/assets/Windows_Portable_README.txt          |  2 ++
 resources/systems/macos/es_find_rules.xml          |  7 +++++++
 resources/systems/macos/es_systems.xml             |  3 ++-
 resources/systems/unix/es_find_rules.xml           | 11 +++++++++++
 resources/systems/unix/es_systems.xml              |  3 ++-
 resources/systems/windows/es_find_rules.xml        | 14 ++++++++++++++
 .../systems/windows/es_find_rules_portable.xml     | 11 +++++++++++
 resources/systems/windows/es_systems.xml           |  3 ++-
 8 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index d879c7b28..3410696f3 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -72,6 +72,8 @@ Emulators\tsugaru\Tsugaru_CUI.exe
 Emulators\VBA-M\visualboyadvance-m.exe
 Emulators\VICE\x64sc.exe
 Emulators\VICE\bin\x64sc.exe
+Emulators\VICE\xvic.exe
+Emulators\VICE\bin\xvic.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 b19533cd5..38e097a2a 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -253,6 +253,13 @@
             <entry>/usr/local/bin/x64sc</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XVIC">
+        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <rule type="staticpath">
+            <entry>/opt/homebrew/bin/xvic</entry>
+            <entry>/usr/local/bin/xvic</entry>
+        </rule>
+    </emulator>
     <emulator name="XEMU">
         <!-- Microsoft Xbox emulator xemu -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index dee762e62..c347564d8 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1522,7 +1522,8 @@
         <fullname>Commodore VIC-20</fullname>
         <path>%ROMPATH%/vic20</path>
         <extension>.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</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.dylib %ROM%</command>
+        <command label="VICE xvic">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.dylib %ROM%</command>
+        <command label="VICE xvic (Standalone)">%EMULATOR_VICE-XVIC% %ROM%</command>
         <platform>vic20</platform>
         <theme>vic20</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 71471c6df..a39a4b7c8 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -530,6 +530,17 @@
             <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XVIC">
+        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <rule type="systempath">
+            <entry>xvic</entry>
+            <entry>vice-jz.xvic</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
+            <entry>~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
+        </rule>
+    </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index ac73c24ee..e289117a0 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1553,7 +1553,8 @@
         <fullname>Commodore VIC-20</fullname>
         <path>%ROMPATH%/vic20</path>
         <extension>.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</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM%</command>
+        <command label="VICE xvic">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM%</command>
+        <command label="VICE xvic (Standalone)">%EMULATOR_VICE-XVIC% %ROM%</command>
         <platform>vic20</platform>
         <theme>vic20</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 31963b56b..b89a5d8c5 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -582,6 +582,20 @@
             <entry>%ESPATH%\..\VICE\bin\x64sc.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XVIC">
+        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <rule type="systempath">
+            <entry>xvic.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\..\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\Emulators\VICE\bin\xvic.exe</entry>
+            <entry>%ESPATH%\VICE\bin\xvic.exe</entry>
+            <entry>%ESPATH%\..\VICE\bin\xvic.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 8ab5bd72b..5c0025e8c 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -400,6 +400,17 @@
             <entry>%ESPATH%\..\VICE\bin\x64sc.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VICE-XVIC">
+        <!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\..\VICE\xvic.exe</entry>
+            <entry>%ESPATH%\Emulators\VICE\bin\xvic.exe</entry>
+            <entry>%ESPATH%\VICE\bin\xvic.exe</entry>
+            <entry>%ESPATH%\..\VICE\bin\xvic.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 4fed09f85..9f71a79df 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1554,7 +1554,8 @@
         <fullname>Commodore VIC-20</fullname>
         <path>%ROMPATH%\vic20</path>
         <extension>.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</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xvic_libretro.dll %ROM%</command>
+        <command label="VICE xvic">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\vice_xvic_libretro.dll %ROM%</command>
+        <command label="VICE xvic (Standalone)">%EMULATOR_VICE-XVIC% %ROM%</command>
         <platform>vic20</platform>
         <theme>vic20</theme>
     </system>