From 0917a7295fc020a3ea41948e5e3e90c84d8ed485 Mon Sep 17 00:00:00 2001 From: AJR Date: Fri, 20 Sep 2019 10:13:01 -0400 Subject: [PATCH] acorn_vidc: Move to src/devices/video and fix full build (nw) --- scripts/src/machine.lua | 12 ------------ scripts/src/video.lua | 12 ++++++++++++ scripts/target/mame/arcade.lua | 1 + scripts/target/mame/mess.lua | 1 + src/devices/{machine => video}/acorn_vidc.cpp | 0 src/devices/{machine => video}/acorn_vidc.h | 0 src/mame/includes/archimds.h | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) rename src/devices/{machine => video}/acorn_vidc.cpp (100%) rename src/devices/{machine => video}/acorn_vidc.h (100%) diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 96598c3aab8..fa836f90189 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -4161,15 +4161,3 @@ if (MACHINES["VRENDER0"]~=null) then MAME_DIR .. "src/devices/machine/vrender0.h", } end - --------------------------------------------------- --- ---@src/devices/machine/acorn_vidc.h,MACHINES["ACORN_VIDC10"] = true --------------------------------------------------- - -if (MACHINES["ACORN_VIDC10"]~=null) then - files { - MAME_DIR .. "src/devices/machine/acorn_vidc.cpp", - MAME_DIR .. "src/devices/machine/acorn_vidc.h", - } -end diff --git a/scripts/src/video.lua b/scripts/src/video.lua index d4c4920002a..fae7bad2434 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -41,6 +41,18 @@ if (VIDEOS["SEGA315_5313"]~=null) then } end +-------------------------------------------------- +-- +--@src/devices/video/acorn_vidc.h,MACHINES["ACORN_VIDC"] = true +-------------------------------------------------- + +if (VIDEOS["ACORN_VIDC"]~=null) then + files { + MAME_DIR .. "src/devices/video/acorn_vidc.cpp", + MAME_DIR .. "src/devices/video/acorn_vidc.h", + } +end + -------------------------------------------------- -- --@src/devices/video/am8052.h,VIDEOS["AM8052"] = true diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 6c746f1b680..197aa20f8af 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -284,6 +284,7 @@ SOUNDS["LC7535"] = true VIDEOS["SEGA315_5124"] = true VIDEOS["SEGA315_5313"] = true +VIDEOS["ACORN_VIDC"] = true --VIDEOS["AM8052"] = true VIDEOS["BUFSPRITE"] = true --VIDEOS["CDP1861"] = true diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 0e809ed1c3a..b296ebd096d 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -299,6 +299,7 @@ SOUNDS["SWP30"] = true VIDEOS["SEGA315_5124"] = true VIDEOS["SEGA315_5313"] = true +VIDEOS["ACORN_VIDC"] = true VIDEOS["AM8052"] = true --VIDEOS["BUFSPRITE"] = true VIDEOS["BT45X"] = true diff --git a/src/devices/machine/acorn_vidc.cpp b/src/devices/video/acorn_vidc.cpp similarity index 100% rename from src/devices/machine/acorn_vidc.cpp rename to src/devices/video/acorn_vidc.cpp diff --git a/src/devices/machine/acorn_vidc.h b/src/devices/video/acorn_vidc.h similarity index 100% rename from src/devices/machine/acorn_vidc.h rename to src/devices/video/acorn_vidc.h diff --git a/src/mame/includes/archimds.h b/src/mame/includes/archimds.h index e6080400cfb..249967e4f6f 100644 --- a/src/mame/includes/archimds.h +++ b/src/mame/includes/archimds.h @@ -14,7 +14,7 @@ #include "machine/aakart.h" #include "machine/i2cmem.h" #include "machine/wd_fdc.h" -#include "machine/acorn_vidc.h" +#include "video/acorn_vidc.h" // interrupt definitions. these are for the real Archimedes computer - arcade // and gambling knockoffs likely are a bit different.