From 8f90d2461ff98fa229451369e6e1e26973839fc5 Mon Sep 17 00:00:00 2001
From: phillip_benoit <none@none.com>
Date: Wed, 29 May 2024 16:20:33 -0700
Subject: [PATCH 1/7] initial test of naomi and atomiswave

---
 .gitignore    | 3 +++
 platforms.cfg | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7217f05d3d..c4789c2106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@ tmp/
 
 # 3rd Party Repos
 ext/*
+
+# Microsoft IDEs
+.vs*
diff --git a/platforms.cfg b/platforms.cfg
index bab9ff53a9..4285810e66 100644
--- a/platforms.cfg
+++ b/platforms.cfg
@@ -40,6 +40,10 @@ atarilynx_fullname="Atari Lynx"
 atarist_exts=".st .stx .img .m3u .rom .raw .ipf .ctr .zip"
 atarist_fullname="Atari ST"
 
+atomiswave_exts=".zip"
+atomiswave_fullname="Sammy Atomiswave Arcade System"
+atomiswave_platform="arcade"
+
 c64_exts=".cmd .crt .d64 .d71 .d80 .d81 .g64 .prg .m3u .t64 .tap .x64 .zip .vsf"
 c64_fullname="Commodore 64"
 
@@ -140,6 +144,10 @@ moto_fullname="Thomson MO/TO"
 n64_exts=".z64 .n64 .v64 .zip"
 n64_fullname="Nintendo 64"
 
+naomi_exts=".zip"
+naomi_fullname="Sega NAOMI Arcade System"
+naomi_platform="arcade"
+
 nds_exts=".nds .zip"
 nds_fullname="Nintendo DS"
 

From 6847f4b3cf1640135a2906591498ffe07723eca8 Mon Sep 17 00:00:00 2001
From: PhillBenoit <none@none.com>
Date: Wed, 29 May 2024 21:28:59 -0700
Subject: [PATCH 2/7] add support for additional fields in platforms.cfg and
 add Atomiswave and NAOMI to Flycast's list of systems

---
 platforms.cfg                                 |  2 ++
 scriptmodules/helpers.sh                      | 25 +++++++++++++++----
 scriptmodules/libretrocores/lr-flycast-dev.sh |  2 +-
 scriptmodules/libretrocores/lr-flycast.sh     |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/platforms.cfg b/platforms.cfg
index 4285810e66..43124f8279 100644
--- a/platforms.cfg
+++ b/platforms.cfg
@@ -43,6 +43,7 @@ atarist_fullname="Atari ST"
 atomiswave_exts=".zip"
 atomiswave_fullname="Sammy Atomiswave Arcade System"
 atomiswave_platform="arcade"
+atomiswave_cmd="dreamcast"
 
 c64_exts=".cmd .crt .d64 .d71 .d80 .d81 .g64 .prg .m3u .t64 .tap .x64 .zip .vsf"
 c64_fullname="Commodore 64"
@@ -147,6 +148,7 @@ n64_fullname="Nintendo 64"
 naomi_exts=".zip"
 naomi_fullname="Sega NAOMI Arcade System"
 naomi_platform="arcade"
+naomi_cmd="dreamcast"
 
 nds_exts=".nds .zip"
 nds_fullname="Nintendo DS"
diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
index 4eb716b687..f6fc77cac1 100644
--- a/scriptmodules/helpers.sh
+++ b/scriptmodules/helpers.sh
@@ -1383,11 +1383,15 @@ function addSystem() {
     local fullname="$2"
     local exts=($3)
 
-    local platform="$system"
-    local theme="$system"
+    # these can all be set manually in platfomrs.cfg
+    # they can be used to link to ther systems and default to $sysetem
+    local platform
+    local theme
     local cmd
     local path
 
+    local temp
+
     # if removing and we don't have an emulators.cfg we can remove the system from the frontends
     if [[ "$md_mode" == "remove" ]] && [[ ! -f "$md_conf_root/$system/emulators.cfg" ]]; then
         delSystem "$system" "$fullname"
@@ -1399,13 +1403,24 @@ function addSystem() {
         cmd="bash %ROM%"
         path="$romdir/ports"
     else
-        cmd="$rootdir/supplementary/runcommand/runcommand.sh 0 _SYS_ $system %ROM%"
-        path="$romdir/$system"
+        
+        # Support for custom system launch command associations in platforms.cfg
+        temp="$(getPlatformConfig "${system}_command")"
+        if ! [[ -n "$temp" ]]; then
+            temp="$system"
+        fi
+        cmd="$rootdir/supplementary/runcommand/runcommand.sh 0 _SYS_ $temp %ROM%"
+
+        # Support for custom rom directory associations in platforms.cfg
+        temp="$(getPlatformConfig "${system}_path")"
+        if ! [[ -n "$temp" ]]; then
+            temp="$system"
+        fi
+        path="$romdir/$temp"
     fi
 
     exts+=("$(getPlatformConfig "${system}_exts")")
 
-    local temp
     temp="$(getPlatformConfig "${system}_theme")"
     if [[ -n "$temp" ]]; then
         theme="$temp"
diff --git a/scriptmodules/libretrocores/lr-flycast-dev.sh b/scriptmodules/libretrocores/lr-flycast-dev.sh
index 493319ab92..75591ede13 100644
--- a/scriptmodules/libretrocores/lr-flycast-dev.sh
+++ b/scriptmodules/libretrocores/lr-flycast-dev.sh
@@ -54,7 +54,7 @@ function install_lr-flycast-dev() {
 function configure_lr-flycast-dev() {
     local sys
     local def
-    for sys in "arcade" "dreamcast"; do
+    for sys in "arcade" "dreamcast" "naomi" "atomiswave"; do
         def=0
         isPlatform "kms" && [[ "$sys" == "dreamcast" ]] && def=1
         # segfaults on the rpi without redirecting stdin from </dev/null
diff --git a/scriptmodules/libretrocores/lr-flycast.sh b/scriptmodules/libretrocores/lr-flycast.sh
index 21b61b7e6a..eb25fa7d42 100644
--- a/scriptmodules/libretrocores/lr-flycast.sh
+++ b/scriptmodules/libretrocores/lr-flycast.sh
@@ -73,7 +73,7 @@ function install_lr-flycast() {
 
 function configure_lr-flycast() {
     local sys
-    local systems=(dreamcast arcade)
+    local systems=(dreamcast arcade naomi atomiswave)
     local def
     for sys in "${systems[@]}"; do
         def=0

From c5dd06b83cef727e9aabd0c7d896ee5b3a703448 Mon Sep 17 00:00:00 2001
From: PhillBenoit <none@none.com>
Date: Wed, 29 May 2024 21:42:18 -0700
Subject: [PATCH 3/7] fix naming error

---
 scriptmodules/helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
index f6fc77cac1..255848a49f 100644
--- a/scriptmodules/helpers.sh
+++ b/scriptmodules/helpers.sh
@@ -1405,7 +1405,7 @@ function addSystem() {
     else
         
         # Support for custom system launch command associations in platforms.cfg
-        temp="$(getPlatformConfig "${system}_command")"
+        temp="$(getPlatformConfig "${system}_cmd")"
         if ! [[ -n "$temp" ]]; then
             temp="$system"
         fi

From 8a2dad73a346fc3df6852bdd78a20502e9ce275b Mon Sep 17 00:00:00 2001
From: PhillBenoit <PhillBenoit@users.noreply.github.com>
Date: Wed, 29 May 2024 23:05:31 -0700
Subject: [PATCH 4/7] Update helpers.sh

spelling
---
 scriptmodules/helpers.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
index 255848a49f..72e800bda3 100644
--- a/scriptmodules/helpers.sh
+++ b/scriptmodules/helpers.sh
@@ -1383,8 +1383,8 @@ function addSystem() {
     local fullname="$2"
     local exts=($3)
 
-    # these can all be set manually in platfomrs.cfg
-    # they can be used to link to ther systems and default to $sysetem
+    # these can all be set manually in platforms.cfg
+    # they can be used to link to other systems and default to $sysetem
     local platform
     local theme
     local cmd

From d9291cc735be0520701af614c1fd099b8d004f3d Mon Sep 17 00:00:00 2001
From: PhillBenoit <none@none.com>
Date: Thu, 30 May 2024 14:09:12 -0700
Subject: [PATCH 5/7] roll back changes to helpers.sh

---
 platforms.cfg            |  2 --
 scriptmodules/helpers.sh | 27 ++++++---------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/platforms.cfg b/platforms.cfg
index 43124f8279..4285810e66 100644
--- a/platforms.cfg
+++ b/platforms.cfg
@@ -43,7 +43,6 @@ atarist_fullname="Atari ST"
 atomiswave_exts=".zip"
 atomiswave_fullname="Sammy Atomiswave Arcade System"
 atomiswave_platform="arcade"
-atomiswave_cmd="dreamcast"
 
 c64_exts=".cmd .crt .d64 .d71 .d80 .d81 .g64 .prg .m3u .t64 .tap .x64 .zip .vsf"
 c64_fullname="Commodore 64"
@@ -148,7 +147,6 @@ n64_fullname="Nintendo 64"
 naomi_exts=".zip"
 naomi_fullname="Sega NAOMI Arcade System"
 naomi_platform="arcade"
-naomi_cmd="dreamcast"
 
 nds_exts=".nds .zip"
 nds_fullname="Nintendo DS"
diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
index 255848a49f..007ec02f8e 100644
--- a/scriptmodules/helpers.sh
+++ b/scriptmodules/helpers.sh
@@ -1383,15 +1383,11 @@ function addSystem() {
     local fullname="$2"
     local exts=($3)
 
-    # these can all be set manually in platfomrs.cfg
-    # they can be used to link to ther systems and default to $sysetem
-    local platform
-    local theme
+    local platform="$system"
+    local theme="$system"
     local cmd
     local path
 
-    local temp
-
     # if removing and we don't have an emulators.cfg we can remove the system from the frontends
     if [[ "$md_mode" == "remove" ]] && [[ ! -f "$md_conf_root/$system/emulators.cfg" ]]; then
         delSystem "$system" "$fullname"
@@ -1403,24 +1399,13 @@ function addSystem() {
         cmd="bash %ROM%"
         path="$romdir/ports"
     else
-        
-        # Support for custom system launch command associations in platforms.cfg
-        temp="$(getPlatformConfig "${system}_cmd")"
-        if ! [[ -n "$temp" ]]; then
-            temp="$system"
-        fi
-        cmd="$rootdir/supplementary/runcommand/runcommand.sh 0 _SYS_ $temp %ROM%"
-
-        # Support for custom rom directory associations in platforms.cfg
-        temp="$(getPlatformConfig "${system}_path")"
-        if ! [[ -n "$temp" ]]; then
-            temp="$system"
-        fi
-        path="$romdir/$temp"
+        cmd="$rootdir/supplementary/runcommand/runcommand.sh 0 _SYS_ $system %ROM%"
+        path="$romdir/$system"
     fi
 
     exts+=("$(getPlatformConfig "${system}_exts")")
 
+    local temp
     temp="$(getPlatformConfig "${system}_theme")"
     if [[ -n "$temp" ]]; then
         theme="$temp"
@@ -1755,4 +1740,4 @@ function signFile() {
         return 1
     fi
     return 0
-}
+}
\ No newline at end of file

From 4c6d26a3da4242f2852ee19c0b2203570a1d3d09 Mon Sep 17 00:00:00 2001
From: PhillBenoit <19508075+PhillBenoit@users.noreply.github.com>
Date: Thu, 30 May 2024 15:32:00 -0700
Subject: [PATCH 6/7] remove redundant arcade designation from flycast

---
 scriptmodules/libretrocores/lr-flycast-dev.sh | 2 +-
 scriptmodules/libretrocores/lr-flycast.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scriptmodules/libretrocores/lr-flycast-dev.sh b/scriptmodules/libretrocores/lr-flycast-dev.sh
index 75591ede13..395f9e9c05 100644
--- a/scriptmodules/libretrocores/lr-flycast-dev.sh
+++ b/scriptmodules/libretrocores/lr-flycast-dev.sh
@@ -54,7 +54,7 @@ function install_lr-flycast-dev() {
 function configure_lr-flycast-dev() {
     local sys
     local def
-    for sys in "arcade" "dreamcast" "naomi" "atomiswave"; do
+    for sys in "dreamcast" "naomi" "atomiswave"; do
         def=0
         isPlatform "kms" && [[ "$sys" == "dreamcast" ]] && def=1
         # segfaults on the rpi without redirecting stdin from </dev/null
diff --git a/scriptmodules/libretrocores/lr-flycast.sh b/scriptmodules/libretrocores/lr-flycast.sh
index eb25fa7d42..01b4f52be2 100644
--- a/scriptmodules/libretrocores/lr-flycast.sh
+++ b/scriptmodules/libretrocores/lr-flycast.sh
@@ -73,7 +73,7 @@ function install_lr-flycast() {
 
 function configure_lr-flycast() {
     local sys
-    local systems=(dreamcast arcade naomi atomiswave)
+    local systems=(dreamcast naomi atomiswave)
     local def
     for sys in "${systems[@]}"; do
         def=0

From def3f44ea4c4e78cabdbecc67651b93227b000af Mon Sep 17 00:00:00 2001
From: PhillBenoit <19508075+PhillBenoit@users.noreply.github.com>
Date: Wed, 5 Jun 2024 13:25:33 -0700
Subject: [PATCH 7/7] roll back Atomiswave changes

---
 platforms.cfg                                 | 6 +-----
 scriptmodules/libretrocores/lr-flycast-dev.sh | 5 +++--
 scriptmodules/libretrocores/lr-flycast.sh     | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/platforms.cfg b/platforms.cfg
index 4285810e66..a1bbb0a973 100644
--- a/platforms.cfg
+++ b/platforms.cfg
@@ -40,10 +40,6 @@ atarilynx_fullname="Atari Lynx"
 atarist_exts=".st .stx .img .m3u .rom .raw .ipf .ctr .zip"
 atarist_fullname="Atari ST"
 
-atomiswave_exts=".zip"
-atomiswave_fullname="Sammy Atomiswave Arcade System"
-atomiswave_platform="arcade"
-
 c64_exts=".cmd .crt .d64 .d71 .d80 .d81 .g64 .prg .m3u .t64 .tap .x64 .zip .vsf"
 c64_fullname="Commodore 64"
 
@@ -145,7 +141,7 @@ n64_exts=".z64 .n64 .v64 .zip"
 n64_fullname="Nintendo 64"
 
 naomi_exts=".zip"
-naomi_fullname="Sega NAOMI Arcade System"
+naomi_fullname="NAOMI Arcade System"
 naomi_platform="arcade"
 
 nds_exts=".nds .zip"
diff --git a/scriptmodules/libretrocores/lr-flycast-dev.sh b/scriptmodules/libretrocores/lr-flycast-dev.sh
index 395f9e9c05..9171d41170 100644
--- a/scriptmodules/libretrocores/lr-flycast-dev.sh
+++ b/scriptmodules/libretrocores/lr-flycast-dev.sh
@@ -53,8 +53,9 @@ function install_lr-flycast-dev() {
 
 function configure_lr-flycast-dev() {
     local sys
+    local systems=(dreamcast naomi arcade)
     local def
-    for sys in "dreamcast" "naomi" "atomiswave"; do
+    for sys in "${systems[@]}"; do
         def=0
         isPlatform "kms" && [[ "$sys" == "dreamcast" ]] && def=1
         # segfaults on the rpi without redirecting stdin from </dev/null
@@ -64,7 +65,7 @@ function configure_lr-flycast-dev() {
 
     [[ "$md_mode" == "remove" ]] && return
 
-    for sys in "arcade" "dreamcast"; do
+    for sys in "${systems[@]}"; do
         mkRomDir "$sys"
         defaultRAConfig "$sys"
     done
diff --git a/scriptmodules/libretrocores/lr-flycast.sh b/scriptmodules/libretrocores/lr-flycast.sh
index 01b4f52be2..60d2844d6d 100644
--- a/scriptmodules/libretrocores/lr-flycast.sh
+++ b/scriptmodules/libretrocores/lr-flycast.sh
@@ -73,7 +73,7 @@ function install_lr-flycast() {
 
 function configure_lr-flycast() {
     local sys
-    local systems=(dreamcast naomi atomiswave)
+    local systems=(dreamcast naomi arcade)
     local def
     for sys in "${systems[@]}"; do
         def=0