From 355269c731e43b43c6d6aa34cf333b0140c25bc0 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 2 Oct 2022 17:03:12 +0200
Subject: [PATCH] Added FinalBurn Neo standalone and MAME standalone as
 alternative emulators for various SNK Neo Geo systems.

Also revised some supported file extensions for said systems.
---
 es-app/assets/Windows_Portable_README.txt     |  2 ++
 resources/systems/macos/es_systems.xml        | 21 ++++++++++------
 resources/systems/unix/es_find_rules.xml      | 11 ++++++++
 resources/systems/unix/es_systems.xml         | 25 +++++++++++++------
 resources/systems/windows/es_find_rules.xml   | 15 +++++++++++
 .../windows/es_find_rules_portable.xml        | 11 ++++++++
 resources/systems/windows/es_systems.xml      | 23 +++++++++++------
 7 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index de2ff0925..b04af61e2 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -42,6 +42,8 @@ Emulators\DOSBox-X\dosbox-x.exe
 Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe
 Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe
 Emulators\EasyRPG\Player.exe
+Emulators\fbneo\fbneo64.exe
+Emulators\fbneo\fbneo.exe
 Emulators\flycast\flycast.exe
 Emulators\Hypseus Singe\hypseus.exe
 Emulators\KEmulator\KEmulator.exe
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 1b815f04c..da626c205 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -449,8 +449,8 @@
         <name>fbneo</name>
         <fullname>FinalBurn Neo</fullname>
         <path>%ROMPATH%/fbneo</path>
-        <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
         <platform>arcade</platform>
         <theme>fbneo</theme>
     </system>
@@ -925,8 +925,9 @@
         <name>neogeo</name>
         <fullname>SNK Neo Geo</fullname>
         <path>%ROMPATH%/neogeo</path>
-        <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/neogeo %BASENAME%</command>
         <platform>neogeo</platform>
         <theme>neogeo</theme>
     </system>
@@ -934,8 +935,10 @@
         <name>neogeocd</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%/neogeocd</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.dylib %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.dylib %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/neogeocd neocdz -cdrm %ROM%</command>
         <platform>neogeocd</platform>
         <theme>neogeocd</theme>
     </system>
@@ -943,8 +946,10 @@
         <name>neogeocdjp</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%/neogeocdjp</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.dylib %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.dylib %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.dylib %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/neogeocdjp neocdz -cdrm %ROM%</command>
         <platform>neogeocd</platform>
         <theme>neogeocdjp</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index bdf9c2837..b6e03dfce 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -208,6 +208,17 @@
             <entry>~/bin/easyrpg/easyrpg-player</entry>
         </rule>
     </emulator>
+    <emulator name="FINALBURN-NEO">
+        <!-- Arcade emulator FinalBurn Neo -->
+        <rule type="systempath">
+            <entry>fbneo</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/fbneo/fbneo</entry>
+            <entry>~/.local/bin/fbneo/fbneo</entry>
+            <entry>~/bin/fbneo/fbneo</entry>
+        </rule>
+    </emulator>
     <emulator name="FLYCAST">
         <!-- Sega Dreamcast emulator Flycast -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 317250fe7..823e2a06c 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -454,8 +454,9 @@
         <name>fbneo</name>
         <fullname>FinalBurn Neo</fullname>
         <path>%ROMPATH%/fbneo</path>
-        <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command>
         <platform>arcade</platform>
         <theme>fbneo</theme>
     </system>
@@ -943,8 +944,10 @@
         <name>neogeo</name>
         <fullname>SNK Neo Geo</fullname>
         <path>%ROMPATH%/neogeo</path>
-        <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/neogeo %BASENAME%</command>
         <platform>neogeo</platform>
         <theme>neogeo</theme>
     </system>
@@ -952,8 +955,11 @@
         <name>neogeocd</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%/neogeocd</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% neocdz -fullscreen -cd %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/neogeocd neocdz -cdrm %ROM%</command>
         <platform>neogeocd</platform>
         <theme>neogeocd</theme>
     </system>
@@ -961,8 +967,11 @@
         <name>neogeocdjp</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%/neogeocdjp</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%EMULATOR_FINALBURN-NEO% neocdz -fullscreen -cd %ROM%</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/neogeocdjp neocdz -cdrm %ROM%</command>
         <platform>neogeocd</platform>
         <theme>neogeocdjp</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index d1fc3a569..47feb85bf 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -224,6 +224,21 @@
             <entry>%ESPATH%\..\EasyRPG\Player.exe</entry>
         </rule>
     </emulator>
+    <emulator name="FINALBURN-NEO">
+        <!-- Arcade emulator FinalBurn Neo -->
+        <rule type="systempath">
+            <entry>fbneo64.exe</entry>
+            <entry>fbneo.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\..\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\Emulators\fbneo\fbneo.exe</entry>
+            <entry>%ESPATH%\fbneo\fbneo.exe</entry>
+            <entry>%ESPATH%\..\fbneo\fbneo.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="FLYCAST">
         <!-- Sega Dreamcast emulator Flycast -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index daf86d6dd..644b778c9 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -149,6 +149,17 @@
             <entry>%ESPATH%\..\EasyRPG\Player.exe</entry>
         </rule>
     </emulator>
+    <emulator name="FINALBURN-NEO">
+        <!-- Arcade emulator FinalBurn Neo -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\..\fbneo\fbneo64.exe</entry>
+            <entry>%ESPATH%\Emulators\fbneo\fbneo.exe</entry>
+            <entry>%ESPATH%\fbneo\fbneo.exe</entry>
+            <entry>%ESPATH%\..\fbneo\fbneo.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="FLYCAST">
         <!-- Sega Dreamcast emulator Flycast -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 43032ac25..7ca6d25dd 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -456,8 +456,9 @@
         <name>fbneo</name>
         <fullname>FinalBurn Neo</fullname>
         <path>%ROMPATH%\fbneo</path>
-        <extension>.ccd .CCD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_FINALBURN-NEO% %BASENAME%</command>
         <platform>arcade</platform>
         <theme>fbneo</theme>
     </system>
@@ -946,8 +947,10 @@
         <name>neogeo</name>
         <fullname>SNK Neo Geo</fullname>
         <path>%ROMPATH%\neogeo</path>
-        <extension>.chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
+        <extension>.7z .7Z .zip .ZIP</extension>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
+        <command label="FinalBurn Neo (Standalone)">%STARTDIR%=%EMUDIR% %EMULATOR_FINALBURN-NEO% %BASENAME%</command>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %ROMPATH%\neogeo %BASENAME%</command>
         <platform>neogeo</platform>
         <theme>neogeo</theme>
     </system>
@@ -955,8 +958,10 @@
         <name>neogeocd</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%\neogeocd</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\neocd_libretro.dll %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\neocd_libretro.dll %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %ROMPATH%\neogeocd neocdz -cdrm %ROM%</command>
         <platform>neogeocd</platform>
         <theme>neogeocd</theme>
     </system>
@@ -964,8 +969,10 @@
         <name>neogeocdjp</name>
         <fullname>SNK Neo Geo CD</fullname>
         <path>%ROMPATH%\neogeocdjp</path>
-        <extension>.chd .CHD .cue .CUE .7z .7Z .zip .ZIP</extension>
-        <command>%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\neocd_libretro.dll %ROM%</command>
+        <extension>.chd .CHD .cue .CUE</extension>
+        <command label="NeoCD">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\neocd_libretro.dll %ROM%</command>
+        <command label="FinalBurn Neo">%EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%\fbneo_libretro.dll %ROM%</command>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %ROMPATH%\neogeocdjp neocdz -cdrm %ROM%</command>
         <platform>neogeocd</platform>
         <theme>neogeocdjp</theme>
     </system>