From 2e8c8a379273d0da3855fdd223e88783ed643a1c Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Fri, 1 Jul 2022 16:23:24 +0200 Subject: [PATCH] Move avgdvg into devices --- scripts/src/video.lua | 20 +++++++++++++------ src/{mame/shared => devices/video}/avgdvg.cpp | 0 src/{mame/shared => devices/video}/avgdvg.h | 0 src/mame/atari/asteroid.h | 3 +-- src/mame/atari/bwidow.h | 2 +- src/mame/atari/bzone.cpp | 3 +-- src/mame/atari/mhavoc.cpp | 3 +-- src/mame/atari/quantum.cpp | 2 +- src/mame/atari/starwars.cpp | 3 +-- src/mame/atari/tempest.cpp | 2 +- src/mame/atari/tomcat.cpp | 2 +- src/mame/midway/omegrace.cpp | 2 +- 12 files changed, 23 insertions(+), 19 deletions(-) rename src/{mame/shared => devices/video}/avgdvg.cpp (100%) rename src/{mame/shared => devices/video}/avgdvg.h (100%) diff --git a/scripts/src/video.lua b/scripts/src/video.lua index 5fdc340d250..34184fbe2ef 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -10,6 +10,8 @@ --------------------------------------------------------------------------- files { + MAME_DIR .. "src/devices/video/cgapal.cpp", + MAME_DIR .. "src/devices/video/cgapal.h", MAME_DIR .. "src/devices/video/poly.h", MAME_DIR .. "src/devices/video/sprite.cpp", MAME_DIR .. "src/devices/video/sprite.h", @@ -771,12 +773,6 @@ if (VIDEOS["MOS6566"]~=null) then } end - -files { - MAME_DIR .. "src/devices/video/cgapal.cpp", - MAME_DIR .. "src/devices/video/cgapal.h", -} - -------------------------------------------------- -- --@src/devices/video/pc_vga.h,VIDEOS["PC_VGA"] = true @@ -1413,3 +1409,15 @@ if (VIDEOS["VRENDER0"]~=null) then MAME_DIR .. "src/devices/video/vrender0.h", } end + +-------------------------------------------------- +-- +--@src/devices/video/avgdvg.h,VIDEOS["AVGDVG"] = true +-------------------------------------------------- + +if (VIDEOS["AVGDVG"]~=null) then + files { + MAME_DIR .. "src/devices/video/avgdvg.cpp", + MAME_DIR .. "src/devices/video/avgdvg.h", + } +end diff --git a/src/mame/shared/avgdvg.cpp b/src/devices/video/avgdvg.cpp similarity index 100% rename from src/mame/shared/avgdvg.cpp rename to src/devices/video/avgdvg.cpp diff --git a/src/mame/shared/avgdvg.h b/src/devices/video/avgdvg.h similarity index 100% rename from src/mame/shared/avgdvg.h rename to src/devices/video/avgdvg.h diff --git a/src/mame/atari/asteroid.h b/src/mame/atari/asteroid.h index 6cb800bbe6e..771cc4737c8 100644 --- a/src/mame/atari/asteroid.h +++ b/src/mame/atari/asteroid.h @@ -10,10 +10,9 @@ #pragma once -#include "avgdvg.h" - #include "machine/74153.h" #include "machine/er2055.h" +#include "video/avgdvg.h" #include "sound/discrete.h" class asteroid_state : public driver_device diff --git a/src/mame/atari/bwidow.h b/src/mame/atari/bwidow.h index 293e3a592be..20bed5458b9 100644 --- a/src/mame/atari/bwidow.h +++ b/src/mame/atari/bwidow.h @@ -4,7 +4,7 @@ #ifndef MAME_INCLUDES_BWIDOW_H #define MAME_INCLUDES_BWIDOW_H -#include "avgdvg.h" +#include "video/avgdvg.h" #include "machine/er2055.h" #define MASTER_CLOCK (XTAL(12'096'000)) diff --git a/src/mame/atari/bzone.cpp b/src/mame/atari/bzone.cpp index 986346c1aed..4fc4233de48 100644 --- a/src/mame/atari/bzone.cpp +++ b/src/mame/atari/bzone.cpp @@ -209,10 +209,9 @@ #include "emu.h" #include "bzone.h" -#include "avgdvg.h" - #include "cpu/m6502/m6502.h" #include "machine/watchdog.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "sound/pokey.h" diff --git a/src/mame/atari/mhavoc.cpp b/src/mame/atari/mhavoc.cpp index 7ec3832d1cd..b526fe63672 100644 --- a/src/mame/atari/mhavoc.cpp +++ b/src/mame/atari/mhavoc.cpp @@ -192,9 +192,8 @@ #include "emu.h" #include "mhavoc.h" -#include "avgdvg.h" - #include "cpu/m6502/m6502.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "machine/eeprompar.h" #include "machine/rescap.h" diff --git a/src/mame/atari/quantum.cpp b/src/mame/atari/quantum.cpp index e95094aeb80..ab6eb93a9d5 100644 --- a/src/mame/atari/quantum.cpp +++ b/src/mame/atari/quantum.cpp @@ -49,13 +49,13 @@ NOTE: The Atari 136002-125 PROM in the sets below wasn't dumped from an actual ***************************************************************************/ #include "emu.h" -#include "avgdvg.h" #include "cpu/m68000/m68000.h" #include "machine/watchdog.h" #include "machine/x2212.h" #include "sound/discrete.h" #include "sound/pokey.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "screen.h" diff --git a/src/mame/atari/starwars.cpp b/src/mame/atari/starwars.cpp index f5b509ac607..ce52d4dc4e0 100644 --- a/src/mame/atari/starwars.cpp +++ b/src/mame/atari/starwars.cpp @@ -27,12 +27,11 @@ #include "emu.h" #include "starwars.h" -#include "avgdvg.h" - #include "cpu/m6809/m6809.h" #include "machine/74259.h" #include "machine/adc0808.h" #include "machine/watchdog.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "screen.h" #include "speaker.h" diff --git a/src/mame/atari/tempest.cpp b/src/mame/atari/tempest.cpp index 6a57980f0a3..08f37a59a9f 100644 --- a/src/mame/atari/tempest.cpp +++ b/src/mame/atari/tempest.cpp @@ -276,7 +276,6 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738 ***************************************************************************/ #include "emu.h" -#include "avgdvg.h" #include "mathbox.h" #include "cpu/m6502/m6502.h" @@ -284,6 +283,7 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738 #include "machine/rescap.h" #include "machine/watchdog.h" #include "sound/pokey.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "screen.h" diff --git a/src/mame/atari/tomcat.cpp b/src/mame/atari/tomcat.cpp index b38848d6a6f..9b0c7729e37 100644 --- a/src/mame/atari/tomcat.cpp +++ b/src/mame/atari/tomcat.cpp @@ -25,11 +25,11 @@ */ #include "emu.h" -#include "avgdvg.h" #include "cpu/m68000/m68000.h" #include "cpu/tms32010/tms32010.h" #include "cpu/m6502/m6502.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "machine/74259.h" #include "machine/adc0808.h" diff --git a/src/mame/midway/omegrace.cpp b/src/mame/midway/omegrace.cpp index 4304d05e26c..717eabbf8f1 100644 --- a/src/mame/midway/omegrace.cpp +++ b/src/mame/midway/omegrace.cpp @@ -217,13 +217,13 @@ #include "emu.h" -#include "avgdvg.h" #include "cpu/z80/z80.h" #include "machine/gen_latch.h" #include "machine/nvram.h" #include "machine/watchdog.h" #include "sound/ay8910.h" +#include "video/avgdvg.h" #include "video/vector.h" #include "screen.h"