summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author angelosa <salese_corp_ltd@email.it>2018-04-21 16:03:16 +0200
committer angelosa <salese_corp_ltd@email.it>2018-04-21 17:26:01 +0200
commit1b3c344ba3cb45035dccfb976686338802621917 (patch)
tree6ecad782b3d72a56d7f08204c556d870d8847ebf
parent8a67c8687c8bc6d046641f027f31f7f5d2275d06 (diff)
Bulk move includes/nb141*m*.h -> machine/nb141*m.h (nw)
-rw-r--r--scripts/target/mame/arcade.lua4
-rw-r--r--src/mame/drivers/nbmj9195.cpp1
-rw-r--r--src/mame/drivers/niyanpai.cpp1
-rw-r--r--src/mame/includes/armedf.h2
-rw-r--r--src/mame/includes/galivan.h2
-rw-r--r--src/mame/includes/hyhoo.h2
-rw-r--r--src/mame/includes/nbmj8688.h2
-rw-r--r--src/mame/includes/nbmj8891.h2
-rw-r--r--src/mame/includes/nbmj8900.h2
-rw-r--r--src/mame/includes/nbmj8991.h2
-rw-r--r--src/mame/includes/nbmj9195.h1
-rw-r--r--src/mame/includes/niyanpai.h1
-rw-r--r--src/mame/includes/pastelg.h2
-rw-r--r--src/mame/machine/nb1413m3.cpp2
-rw-r--r--src/mame/machine/nb1413m3.h (renamed from src/mame/includes/nb1413m3.h)0
-rw-r--r--src/mame/machine/nb1414m4.cpp2
-rw-r--r--src/mame/machine/nb1414m4.h (renamed from src/mame/includes/nb1414m4.h)0
17 files changed, 14 insertions, 14 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 2b46c660e42..460f1640592 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2912,9 +2912,9 @@ files {
MAME_DIR .. "src/mame/audio/wiping.h",
MAME_DIR .. "src/mame/video/wiping.cpp",
MAME_DIR .. "src/mame/machine/nb1413m3.cpp",
- MAME_DIR .. "src/mame/includes/nb1413m3.h",
+ MAME_DIR .. "src/mame/machine/nb1413m3.h",
MAME_DIR .. "src/mame/machine/nb1414m4.cpp",
- MAME_DIR .. "src/mame/includes/nb1414m4.h",
+ MAME_DIR .. "src/mame/machine/nb1414m4.h",
}
createMAMEProjects(_target, _subtarget, "nintendo")
diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp
index b08c68ccd90..b2684385625 100644
--- a/src/mame/drivers/nbmj9195.cpp
+++ b/src/mame/drivers/nbmj9195.cpp
@@ -23,7 +23,6 @@ Notes:
#include "emu.h"
#include "includes/nbmj9195.h"
-#include "includes/nb1413m3.h" // needed for mahjong input controller
#include "machine/gen_latch.h"
#include "machine/nvram.h"
diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp
index c50a0ee0431..c61f183325e 100644
--- a/src/mame/drivers/niyanpai.cpp
+++ b/src/mame/drivers/niyanpai.cpp
@@ -37,7 +37,6 @@ Memo:
#include "emu.h"
#include "includes/niyanpai.h"
-#include "includes/nb1413m3.h"
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index 79a2623ac97..31de26dc536 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Phil Stroffolino, Carlos A. Lozano
-#include "includes/nb1414m4.h"
+#include "machine/nb1414m4.h"
#include "machine/gen_latch.h"
#include "video/bufsprite.h"
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index 6703f87cecb..7cec54ef92b 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "includes/nb1414m4.h"
+#include "machine/nb1414m4.h"
#include "machine/gen_latch.h"
#include "video/bufsprite.h"
diff --git a/src/mame/includes/hyhoo.h b/src/mame/includes/hyhoo.h
index 9366d9d4989..605562238e3 100644
--- a/src/mame/includes/hyhoo.h
+++ b/src/mame/includes/hyhoo.h
@@ -1,6 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
#include "screen.h"
class hyhoo_state : public driver_device
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
index d615fca7a80..dcfc73f7ac8 100644
--- a/src/mame/includes/nbmj8688.h
+++ b/src/mame/includes/nbmj8688.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
#include "video/hd61830.h"
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
class nbmj8688_state : public driver_device
{
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
index 4be77eb4d74..f477a719012 100644
--- a/src/mame/includes/nbmj8891.h
+++ b/src/mame/includes/nbmj8891.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
#include "screen.h"
class nbmj8891_state : public driver_device
diff --git a/src/mame/includes/nbmj8900.h b/src/mame/includes/nbmj8900.h
index a763cc8907f..306d8aa60aa 100644
--- a/src/mame/includes/nbmj8900.h
+++ b/src/mame/includes/nbmj8900.h
@@ -1,6 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
#include "screen.h"
class nbmj8900_state : public driver_device
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
index 3512f0729bb..0fcb0d2066c 100644
--- a/src/mame/includes/nbmj8991.h
+++ b/src/mame/includes/nbmj8991.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
#include "machine/gen_latch.h"
#include "screen.h"
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 9548d1a7d06..25d94f28533 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -7,6 +7,7 @@
******************************************************************************/
#include "cpu/z80/tmpz84c011.h"
+#include "machine/nb1413m3.h" // needed for mahjong input controller
#include "machine/gen_latch.h"
#include "screen.h"
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
index 6fc19a9e905..5e5699252a4 100644
--- a/src/mame/includes/niyanpai.h
+++ b/src/mame/includes/niyanpai.h
@@ -4,6 +4,7 @@
#include "machine/tmp68301.h"
#include "screen.h"
#include "audio/nichisnd.h"
+#include "machine/nb1413m3.h"
#define VRAM_MAX 3
diff --git a/src/mame/includes/pastelg.h b/src/mame/includes/pastelg.h
index 1e5f7d7d476..e8eee13e271 100644
--- a/src/mame/includes/pastelg.h
+++ b/src/mame/includes/pastelg.h
@@ -1,6 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Takahiro Nogi
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
#include "screen.h"
class pastelg_state : public driver_device
diff --git a/src/mame/machine/nb1413m3.cpp b/src/mame/machine/nb1413m3.cpp
index 6932ee133d8..968de081167 100644
--- a/src/mame/machine/nb1413m3.cpp
+++ b/src/mame/machine/nb1413m3.cpp
@@ -13,7 +13,7 @@ Memo:
******************************************************************************/
#include "emu.h"
-#include "includes/nb1413m3.h"
+#include "machine/nb1413m3.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/nb1413m3.h b/src/mame/machine/nb1413m3.h
index 30d62a002f1..30d62a002f1 100644
--- a/src/mame/includes/nb1413m3.h
+++ b/src/mame/machine/nb1413m3.h
diff --git a/src/mame/machine/nb1414m4.cpp b/src/mame/machine/nb1414m4.cpp
index c142f238ad7..103defd75af 100644
--- a/src/mame/machine/nb1414m4.cpp
+++ b/src/mame/machine/nb1414m4.cpp
@@ -27,7 +27,7 @@ Notes:
********************************************************************************************************************/
#include "emu.h"
-#include "includes/nb1414m4.h"
+#include "machine/nb1414m4.h"
#include "screen.h"
DEFINE_DEVICE_TYPE(NB1414M4, nb1414m4_device, "nb1414m4", "NB1414M4 Mahjong Custom")
diff --git a/src/mame/includes/nb1414m4.h b/src/mame/machine/nb1414m4.h
index bba25f89e12..bba25f89e12 100644
--- a/src/mame/includes/nb1414m4.h
+++ b/src/mame/machine/nb1414m4.h