From faaac88e17c33280e63421281ff66b098af4ae9c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 1 May 2016 13:11:46 +0200 Subject: [PATCH] hng64 fix (nw) --- scripts/target/mame/arcade.lua | 5 +++-- src/mame/drivers/hng64.cpp | 2 +- src/mame/machine/hng64_net.h | 4 ++++ src/mame/video/hng64.cpp | 3 +++ src/mame/video/{hng64_3d.cpp => hng64_3d.inc} | 3 --- src/mame/video/{hng64_sprite.cpp => hng64_sprite.inc} | 2 -- 6 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 src/mame/machine/hng64_net.h rename src/mame/video/{hng64_3d.cpp => hng64_3d.inc} (99%) rename src/mame/video/{hng64_sprite.cpp => hng64_sprite.inc} (99%) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 3ba86f0f50b..73853c46675 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3344,8 +3344,9 @@ files { MAME_DIR .. "src/mame/video/hng64.cpp", MAME_DIR .. "src/mame/audio/hng64.cpp", MAME_DIR .. "src/mame/machine/hng64_net.cpp", - MAME_DIR .. "src/mame/video/hng64_3d.cpp", - MAME_DIR .. "src/mame/video/hng64_sprite.cpp", + MAME_DIR .. "src/mame/machine/hng64_net.h", + MAME_DIR .. "src/mame/video/hng64_3d.inc", + MAME_DIR .. "src/mame/video/hng64_sprite.inc", MAME_DIR .. "src/mame/drivers/lasso.cpp", MAME_DIR .. "src/mame/includes/lasso.h", MAME_DIR .. "src/mame/video/lasso.cpp", diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp index 083f4dc2228..6f3a85b5f35 100644 --- a/src/mame/drivers/hng64.cpp +++ b/src/mame/drivers/hng64.cpp @@ -441,6 +441,7 @@ or Fatal Fury for example). #include "cpu/mips/mips3.h" #include "machine/nvram.h" #include "includes/hng64.h" +#include "machine/hng64_net.h" /* TODO: NOT measured! */ #define PIXEL_CLOCK ((HNG64_MASTER_CLOCK*2)/4) // x 2 is due of the interlaced screen ... @@ -1527,7 +1528,6 @@ void hng64_state::machine_reset() } MACHINE_CONFIG_EXTERN(hng64_audio); -MACHINE_CONFIG_EXTERN(hng64_network); static MACHINE_CONFIG_START(hng64, hng64_state) /* basic machine hardware */ diff --git a/src/mame/machine/hng64_net.h b/src/mame/machine/hng64_net.h new file mode 100644 index 00000000000..fd28a398efe --- /dev/null +++ b/src/mame/machine/hng64_net.h @@ -0,0 +1,4 @@ +// license:LGPL-2.1+ +// copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner + +MACHINE_CONFIG_EXTERN(hng64_network); diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp index a666474bb5e..3e8d18e4d82 100644 --- a/src/mame/video/hng64.cpp +++ b/src/mame/video/hng64.cpp @@ -1295,3 +1295,6 @@ void hng64_state::video_start() m_vertsrom = (UINT16*)memregion("verts")->base(); m_vertsrom_size = memregion("verts")->bytes(); } + +#include "video/hng64_3d.inc" +#include "video/hng64_sprite.inc" diff --git a/src/mame/video/hng64_3d.cpp b/src/mame/video/hng64_3d.inc similarity index 99% rename from src/mame/video/hng64_3d.cpp rename to src/mame/video/hng64_3d.inc index b28aa4109d6..b29c66414f7 100644 --- a/src/mame/video/hng64_3d.cpp +++ b/src/mame/video/hng64_3d.inc @@ -1,9 +1,6 @@ // license:LGPL-2.1+ // copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner, Andrew Zaferakis -#include "includes/hng64.h" - - ///////////////////////////////// /// Hyper NeoGeo 64 - 3D bits /// ///////////////////////////////// diff --git a/src/mame/video/hng64_sprite.cpp b/src/mame/video/hng64_sprite.inc similarity index 99% rename from src/mame/video/hng64_sprite.cpp rename to src/mame/video/hng64_sprite.inc index 2bc13e8313a..b24d93753c9 100644 --- a/src/mame/video/hng64_sprite.cpp +++ b/src/mame/video/hng64_sprite.inc @@ -3,8 +3,6 @@ /* Hyper NeoGeo 64 Sprite bits */ -#include "includes/hng64.h" - /* * Sprite Format * ------------------