From 065534a14e78d102340700315eed3dd0026957d9 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Sun, 22 Oct 2023 15:39:06 +0200
Subject: [PATCH] Added the MAME - Current RetroArch core and MAME standalone
 as alternative emulators for the odyssey2 and videopac systems

Also changed the platform for the videopac system to odyssey2 to improve scraping and fixed a minor typo for the odyssey2 full name
---
 resources/systems/macos/es_systems.xml   | 8 ++++++--
 resources/systems/unix/es_systems.xml    | 8 ++++++--
 resources/systems/windows/es_systems.xml | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index c8cb3a6df..e4d79e0ae 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1293,10 +1293,12 @@
     </system>
     <system>
         <name>odyssey2</name>
-        <fullname>Magnavox Odyssey2</fullname>
+        <fullname>Magnavox Odyssey 2</fullname>
         <path>%ROMPATH%/odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.dylib "odyssey2 -rompath %GAMEDIR%\;%ROMPATH%/odyssey2 -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/odyssey2 odyssey2 -cart %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -1949,7 +1951,9 @@
         <path>%ROMPATH%/videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.dylib %ROM%</command>
-        <platform>videopac</platform>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.dylib "videopac -rompath %GAMEDIR%\;%ROMPATH%/videopac -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/videopac videopac -cart %ROM%</command>
+        <platform>odyssey2</platform>
         <theme>videopac</theme>
     </system>
     <system>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 65dcc9116..b633f0e24 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1365,10 +1365,12 @@
     </system>
     <system>
         <name>odyssey2</name>
-        <fullname>Magnavox Odyssey2</fullname>
+        <fullname>Magnavox Odyssey 2</fullname>
         <path>%ROMPATH%/odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "odyssey2 -rompath %GAMEDIR%\;%ROMPATH%/odyssey2 -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/odyssey2 odyssey2 -cart %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -2055,7 +2057,9 @@
         <path>%ROMPATH%/videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM%</command>
-        <platform>videopac</platform>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "videopac -rompath %GAMEDIR%\;%ROMPATH%/videopac -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/videopac videopac -cart %ROM%</command>
+        <platform>odyssey2</platform>
         <theme>videopac</theme>
     </system>
     <system>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 3e2b4534f..a7d3fe069 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1343,10 +1343,12 @@
     </system>
     <system>
         <name>odyssey2</name>
-        <fullname>Magnavox Odyssey2</fullname>
+        <fullname>Magnavox Odyssey 2</fullname>
         <path>%ROMPATH%\odyssey2</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll "odyssey2 -rompath %GAMEDIR%\;%ROMPATH%\odyssey2 -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\odyssey2 odyssey2 -cart %ROM%</command>
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
@@ -2028,7 +2030,9 @@
         <path>%ROMPATH%\videopac</path>
         <extension>.bin .BIN .7z .7Z .zip .ZIP</extension>
         <command label="O2EM">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\o2em_libretro.dll %ROM%</command>
-        <platform>videopac</platform>
+        <command label="MAME - Current">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\mame_libretro.dll "videopac -rompath %GAMEDIR%\;%ROMPATH%\videopac -cart \"%ROMRAW%\""</command>
+        <command label="MAME (Standalone)">%HIDEWINDOW% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\videopac videopac -cart %ROM%</command>
+        <platform>odyssey2</platform>
         <theme>videopac</theme>
     </system>
     <system>