From bd97560ea907f3ddbd9f9b4cdddf51845adbce33 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Wed, 29 Jun 2022 17:14:37 +0200
Subject: [PATCH] source org: merge intv with mattel

---
 scripts/target/mame/mame.lua                   | 7 -------
 src/mame/mame.lst                              | 4 ++--
 src/mame/mattel/{mattelchess.cpp => chess.cpp} | 0
 src/mame/{intv => mattel}/intv.cpp             | 0
 src/mame/{intv => mattel}/intv.h               | 0
 src/mame/{intv => mattel}/intv_m.cpp           | 0
 src/mame/{intv => mattel}/intv_v.cpp           | 0
 src/mame/{intv => mattel}/stic.cpp             | 0
 src/mame/{intv => mattel}/stic.h               | 0
 src/mame/mess.flt                              | 4 ++--
 10 files changed, 4 insertions(+), 11 deletions(-)
 rename src/mame/mattel/{mattelchess.cpp => chess.cpp} (100%)
 rename src/mame/{intv => mattel}/intv.cpp (100%)
 rename src/mame/{intv => mattel}/intv.h (100%)
 rename src/mame/{intv => mattel}/intv_m.cpp (100%)
 rename src/mame/{intv => mattel}/intv_v.cpp (100%)
 rename src/mame/{intv => mattel}/stic.cpp (100%)
 rename src/mame/{intv => mattel}/stic.h (100%)

diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua
index 94620686317..603e42c76a1 100644
--- a/scripts/target/mame/mame.lua
+++ b/scripts/target/mame/mame.lua
@@ -1386,7 +1386,6 @@ function linkProjects_mame_mame(_target, _subtarget)
 		"intel",
 		"interpro",
 		"interton",
-		"intv",
 		"irem",
 		"isc",
 		"itech",
@@ -2443,12 +2442,6 @@ files {
 	MAME_DIR .. "src/mame/interton/*.h",
 }
 
-createMAMEProjects(_target, _subtarget, "intv")
-files {
-	MAME_DIR .. "src/mame/intv/*.cpp",
-	MAME_DIR .. "src/mame/intv/*.h",
-}
-
 createMAMEProjects(_target, _subtarget, "irem")
 files {
 	MAME_DIR .. "src/mame/irem/*.cpp",
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index c54b79c51c1..1efb8bdf09f 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -17465,7 +17465,7 @@ ip6800                          // Intergraph InterPro/InterServe 68x0
 @source:misc/intrscti.cpp
 intrscti                        // ????
 
-@source:intv/intv.cpp
+@source:mattel/intv.cpp
 intv                            // Mattel Intellivision - 1979 AKA INTV
 intv2                           // Mattel Intellivision II- 1982?
 intvecs                         // 1983 - Mattel Intellivision w/ECS and IntelliVoice expansions
@@ -20966,7 +20966,7 @@ matmania                        // TA-0015 (c) 1985 + Taito America license
 @source:misc/matrix.cpp
 matrix                          //
 
-@source:mattel/mattelchess.cpp
+@source:mattel/chess.cpp
 mchess
 
 @source:trs/max80.cpp
diff --git a/src/mame/mattel/mattelchess.cpp b/src/mame/mattel/chess.cpp
similarity index 100%
rename from src/mame/mattel/mattelchess.cpp
rename to src/mame/mattel/chess.cpp
diff --git a/src/mame/intv/intv.cpp b/src/mame/mattel/intv.cpp
similarity index 100%
rename from src/mame/intv/intv.cpp
rename to src/mame/mattel/intv.cpp
diff --git a/src/mame/intv/intv.h b/src/mame/mattel/intv.h
similarity index 100%
rename from src/mame/intv/intv.h
rename to src/mame/mattel/intv.h
diff --git a/src/mame/intv/intv_m.cpp b/src/mame/mattel/intv_m.cpp
similarity index 100%
rename from src/mame/intv/intv_m.cpp
rename to src/mame/mattel/intv_m.cpp
diff --git a/src/mame/intv/intv_v.cpp b/src/mame/mattel/intv_v.cpp
similarity index 100%
rename from src/mame/intv/intv_v.cpp
rename to src/mame/mattel/intv_v.cpp
diff --git a/src/mame/intv/stic.cpp b/src/mame/mattel/stic.cpp
similarity index 100%
rename from src/mame/intv/stic.cpp
rename to src/mame/mattel/stic.cpp
diff --git a/src/mame/intv/stic.h b/src/mame/mattel/stic.h
similarity index 100%
rename from src/mame/intv/stic.h
rename to src/mame/mattel/stic.h
diff --git a/src/mame/mess.flt b/src/mame/mess.flt
index 8462f1ec3f8..90faf41b198 100644
--- a/src/mame/mess.flt
+++ b/src/mame/mess.flt
@@ -393,7 +393,6 @@ intel/sdk85.cpp
 intel/sdk86.cpp
 interpro/interpro.cpp
 interton/vc4000.cpp
-intv/intv.cpp
 isc/compucolor.cpp
 jazz/jazz.cpp
 kawai/kawai_acr20.cpp
@@ -440,8 +439,9 @@ matsushi/jr100.cpp
 matsushi/jr200.cpp
 matsushi/myb3k.cpp
 mattel/aquarius.cpp
+mattel/chess.cpp
+mattel/intv.cpp
 mattel/juicebox.cpp
-mattel/mattelchess.cpp
 mb/microvsn.cpp
 mb/milton6805.cpp
 mchester/ssem.cpp