summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-05-01 12:16:00 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-05-01 12:16:00 +0200
commit79e69182cc9405869df10e26046fc8de6c61efb8 (patch)
treea86ec4b7ccd4f3520103c750cad98fe031777667
parenta0829452f1d256b7884e24ac2f0e4f546841e5a7 (diff)
fixed pong (nw)
-rw-r--r--scripts/target/mame/arcade.lua9
-rw-r--r--scripts/target/mame/nl.lua27
-rw-r--r--src/mame/drivers/pong.cpp7
-rw-r--r--src/mame/machine/nl_breakout.cpp (renamed from src/mame/drivers/nl_breakout.cpp)0
-rw-r--r--src/mame/machine/nl_breakout.h4
-rw-r--r--src/mame/machine/nl_pong.cpp (renamed from src/mame/drivers/nl_pong.cpp)0
-rw-r--r--src/mame/machine/nl_pong.h4
-rw-r--r--src/mame/machine/nl_pongd.cpp (renamed from src/mame/drivers/nl_pongd.cpp)0
-rw-r--r--src/mame/machine/nl_pongd.h4
9 files changed, 36 insertions, 19 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 4c38cff8439..d9fb8fb887e 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1060,9 +1060,12 @@ files {
MAME_DIR .. "src/mame/audio/orbit.cpp",
MAME_DIR .. "src/mame/video/orbit.cpp",
MAME_DIR .. "src/mame/drivers/pong.cpp",
- MAME_DIR .. "src/mame/drivers/nl_pong.cpp",
- MAME_DIR .. "src/mame/drivers/nl_pongd.cpp",
- MAME_DIR .. "src/mame/drivers/nl_breakout.cpp",
+ MAME_DIR .. "src/mame/machine/nl_pong.cpp",
+ MAME_DIR .. "src/mame/machine/nl_pong.h",
+ MAME_DIR .. "src/mame/machine/nl_pongd.cpp",
+ MAME_DIR .. "src/mame/machine/nl_pongd.h",
+ MAME_DIR .. "src/mame/machine/nl_breakout.cpp",
+ MAME_DIR .. "src/mame/machine/nl_breakout.h",
MAME_DIR .. "src/mame/drivers/poolshrk.cpp",
MAME_DIR .. "src/mame/includes/poolshrk.h",
MAME_DIR .. "src/mame/audio/poolshrk.cpp",
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index 6abf50dcd1e..adc58847577 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -86,8 +86,8 @@ function createProjects_mame_nl(_target, _subtarget)
targetsubdir(_target .."_" .. _subtarget)
kind (LIBTYPE)
uuid (os.uuid("drv-mame-nl"))
- addprojectflags()
- precompiledheaders()
+ addprojectflags()
+ precompiledheaders()
includedirs {
MAME_DIR .. "src/osd",
@@ -103,9 +103,12 @@ function createProjects_mame_nl(_target, _subtarget)
files{
MAME_DIR .. "src/mame/drivers/pong.cpp",
- MAME_DIR .. "src/mame/drivers/nl_pong.cpp",
- MAME_DIR .. "src/mame/drivers/nl_pongd.cpp",
- MAME_DIR .. "src/mame/drivers/nl_breakout.cpp",
+ MAME_DIR .. "src/mame/machine/nl_pong.cpp",
+ MAME_DIR .. "src/mame/machine/nl_pong.h",
+ MAME_DIR .. "src/mame/machine/nl_pongd.cpp",
+ MAME_DIR .. "src/mame/machine/nl_pongd.h",
+ MAME_DIR .. "src/mame/machine/nl_breakout.cpp",
+ MAME_DIR .. "src/mame/machine/nl_breakout.h",
MAME_DIR .. "src/mame/drivers/1942.cpp",
MAME_DIR .. "src/mame/includes/1942.h",
@@ -114,13 +117,13 @@ files{
MAME_DIR .. "src/mame/includes/popeye.h",
MAME_DIR .. "src/mame/video/popeye.cpp",
- MAME_DIR .. "src/mame/drivers/m62.cpp",
- MAME_DIR .. "src/mame/includes/m62.h",
- MAME_DIR .. "src/mame/video/m62.cpp",
- MAME_DIR .. "src/mame/audio/irem.cpp",
- MAME_DIR .. "src/mame/audio/nl_kidniki.cpp",
- MAME_DIR .. "src/mame/audio/irem.h",
-
+ MAME_DIR .. "src/mame/drivers/m62.cpp",
+ MAME_DIR .. "src/mame/includes/m62.h",
+ MAME_DIR .. "src/mame/video/m62.cpp",
+ MAME_DIR .. "src/mame/audio/irem.cpp",
+ MAME_DIR .. "src/mame/audio/irem.h",
+ MAME_DIR .. "src/mame/audio/nl_kidniki.cpp",
+ MAME_DIR .. "src/mame/audio/nl_kidniki.h",
}
end
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index 358b7cb35ea..d454b462766 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -50,6 +50,9 @@ TODO: Superpong is believed to use the Pong (Rev E) PCB with some minor modifica
#include "netlist/devices/net_lib.h"
#include "sound/dac.h"
#include "video/fixfreq.h"
+#include "machine/nl_breakout.h"
+#include "machine/nl_pong.h"
+#include "machine/nl_pongd.h"
#include "breakout.lh"
@@ -118,10 +121,6 @@ enum input_changed_enum
IC_VR2
};
-NETLIST_EXTERNAL(pongdoubles)
-NETLIST_EXTERNAL(pong_fast)
-NETLIST_EXTERNAL(breakout)
-
class ttl_mono_state : public driver_device
{
public:
diff --git a/src/mame/drivers/nl_breakout.cpp b/src/mame/machine/nl_breakout.cpp
index 96da4942764..96da4942764 100644
--- a/src/mame/drivers/nl_breakout.cpp
+++ b/src/mame/machine/nl_breakout.cpp
diff --git a/src/mame/machine/nl_breakout.h b/src/mame/machine/nl_breakout.h
new file mode 100644
index 00000000000..193eaa97727
--- /dev/null
+++ b/src/mame/machine/nl_breakout.h
@@ -0,0 +1,4 @@
+// license:GPL-2.0+
+// copyright-holders:DICE Team,Couriersud
+
+NETLIST_EXTERNAL(breakout)
diff --git a/src/mame/drivers/nl_pong.cpp b/src/mame/machine/nl_pong.cpp
index 5192b2ec1c7..5192b2ec1c7 100644
--- a/src/mame/drivers/nl_pong.cpp
+++ b/src/mame/machine/nl_pong.cpp
diff --git a/src/mame/machine/nl_pong.h b/src/mame/machine/nl_pong.h
new file mode 100644
index 00000000000..0152f07e32b
--- /dev/null
+++ b/src/mame/machine/nl_pong.h
@@ -0,0 +1,4 @@
+// license:GPL-2.0+
+// copyright-holders: Couriersud
+
+NETLIST_EXTERNAL(pong_fast)
diff --git a/src/mame/drivers/nl_pongd.cpp b/src/mame/machine/nl_pongd.cpp
index 545b7a1c5f5..545b7a1c5f5 100644
--- a/src/mame/drivers/nl_pongd.cpp
+++ b/src/mame/machine/nl_pongd.cpp
diff --git a/src/mame/machine/nl_pongd.h b/src/mame/machine/nl_pongd.h
new file mode 100644
index 00000000000..2d7ff28b9a6
--- /dev/null
+++ b/src/mame/machine/nl_pongd.h
@@ -0,0 +1,4 @@
+// license:GPL-2.0+
+// copyright-holders:DICE Team,couriersud
+
+NETLIST_EXTERNAL(pongdoubles)