From 02d6b1e457175f857eae62afe4758897c07ce0e0 Mon Sep 17 00:00:00 2001 From: Roberto Benfatto Date: Sun, 14 Feb 2021 12:15:17 +0100 Subject: [PATCH] scripts: Remove references to non-existent headers and duplicate source file references. (#7770) --- scripts/src/bus.lua | 3 +-- scripts/src/cpu.lua | 2 +- scripts/src/emu.lua | 1 - scripts/src/netlist.lua | 15 ++++++++++++--- scripts/target/mame/arcade.lua | 7 ------- scripts/target/mame/mess.lua | 14 ++------------ 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 0f3648f150f..21d8e2371f9 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -3254,7 +3254,6 @@ end if (BUSES["TI99"]~=null) then files { - MAME_DIR .. "src/devices/bus/ti99/ti99defs.h", MAME_DIR .. "src/devices/bus/ti99/internal/992board.cpp", MAME_DIR .. "src/devices/bus/ti99/internal/992board.h", MAME_DIR .. "src/devices/bus/ti99/internal/998board.cpp", @@ -4214,7 +4213,7 @@ if (BUSES["HP_IPC_IO"]~=null) then MAME_DIR .. "src/devices/bus/hp_ipc_io/hp_ipc_io.cpp", MAME_DIR .. "src/devices/bus/hp_ipc_io/hp_ipc_io.h", MAME_DIR .. "src/devices/bus/hp_ipc_io/82919.cpp", - MAME_DIR .. "src/devices/bus/hp_ipc_io/829919.h", + MAME_DIR .. "src/devices/bus/hp_ipc_io/82919.h", } end diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 4860eecbd5e..1965cb11300 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -1235,7 +1235,7 @@ end if (CPUS["DIABLO"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/diablo/diablo1300dasm.cpp") - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ssem/diablo1300dasm.h") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/diablo/diablo1300dasm.h") end -------------------------------------------------- diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index d1d3f0b0d1f..e4f8f47d831 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -253,7 +253,6 @@ files { MAME_DIR .. "src/emu/debug/textbuf.cpp", MAME_DIR .. "src/emu/debug/textbuf.h", MAME_DIR .. "src/emu/drivers/empty.cpp", - MAME_DIR .. "src/emu/drivers/xtal.h", MAME_DIR .. "src/emu/layout/generic.h", MAME_DIR .. "src/emu/video/generic.cpp", MAME_DIR .. "src/emu/video/generic.h", diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index ff21a35cde3..b5d569c6279 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -49,7 +49,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/nl_parser.h", MAME_DIR .. "src/lib/netlist/nl_setup.cpp", MAME_DIR .. "src/lib/netlist/nl_setup.h", - MAME_DIR .. "src/lib/netlist/nl_types.h", + MAME_DIR .. "src/lib/netlist/nltypes.h", MAME_DIR .. "src/lib/netlist/core/analog.h", MAME_DIR .. "src/lib/netlist/core/base_objects.h", MAME_DIR .. "src/lib/netlist/core/core_device.h", @@ -59,13 +59,17 @@ project "netlist" MAME_DIR .. "src/lib/netlist/core/exec.h", MAME_DIR .. "src/lib/netlist/core/logic_family.h", MAME_DIR .. "src/lib/netlist/core/logic.h", + MAME_DIR .. "src/lib/netlist/core/netlist_state.h", MAME_DIR .. "src/lib/netlist/core/nets.h", MAME_DIR .. "src/lib/netlist/core/object_array.h", MAME_DIR .. "src/lib/netlist/core/param.h", + MAME_DIR .. "src/lib/netlist/core/queue.h", MAME_DIR .. "src/lib/netlist/core/setup.h", MAME_DIR .. "src/lib/netlist/core/state_var.h", + MAME_DIR .. "src/lib/netlist/plib/gmres.h", MAME_DIR .. "src/lib/netlist/plib/pconfig.h", MAME_DIR .. "src/lib/netlist/plib/palloc.h", + MAME_DIR .. "src/lib/netlist/plib/parray.h", MAME_DIR .. "src/lib/netlist/plib/pchrono.h", MAME_DIR .. "src/lib/netlist/plib/pgsl.h", MAME_DIR .. "src/lib/netlist/plib/penum.h", @@ -81,6 +85,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pmain.cpp", MAME_DIR .. "src/lib/netlist/plib/pmain.h", MAME_DIR .. "src/lib/netlist/plib/pmath.h", + MAME_DIR .. "src/lib/netlist/plib/pmatrix2d.h", MAME_DIR .. "src/lib/netlist/plib/pmatrix_cr.h", MAME_DIR .. "src/lib/netlist/plib/pmempool.h", MAME_DIR .. "src/lib/netlist/plib/pmulti_threading.h", @@ -91,12 +96,14 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/ppreprocessor.cpp", MAME_DIR .. "src/lib/netlist/plib/ppreprocessor.h", MAME_DIR .. "src/lib/netlist/plib/prandom.h", + MAME_DIR .. "src/lib/netlist/plib/psource.h", MAME_DIR .. "src/lib/netlist/plib/pstate.h", MAME_DIR .. "src/lib/netlist/plib/pstonum.h", MAME_DIR .. "src/lib/netlist/plib/pstring.cpp", MAME_DIR .. "src/lib/netlist/plib/pstring.h", MAME_DIR .. "src/lib/netlist/plib/pstrutil.h", MAME_DIR .. "src/lib/netlist/plib/pstream.h", + MAME_DIR .. "src/lib/netlist/plib/ptests.h", MAME_DIR .. "src/lib/netlist/plib/ptime.h", MAME_DIR .. "src/lib/netlist/plib/ptimed_queue.h", MAME_DIR .. "src/lib/netlist/plib/ptokenizer.cpp", @@ -104,6 +111,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/ptypes.h", MAME_DIR .. "src/lib/netlist/plib/putil.cpp", MAME_DIR .. "src/lib/netlist/plib/putil.h", + MAME_DIR .. "src/lib/netlist/plib/vector_ops.h", MAME_DIR .. "src/lib/netlist/tools/nl_convert.cpp", MAME_DIR .. "src/lib/netlist/tools/nl_convert.h", MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp", @@ -116,18 +124,20 @@ project "netlist" MAME_DIR .. "src/lib/netlist/analog/nlid_twoterm.h", MAME_DIR .. "src/lib/netlist/analog/nld_opamps.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp", + MAME_DIR .. "src/lib/netlist/solver/nld_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.cpp", + MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver_ext.h", MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h", + MAME_DIR .. "src/lib/netlist/solver/nld_ms_gcr.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_w.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h", - MAME_DIR .. "src/lib/netlist/solver/vector_base.h", MAME_DIR .. "src/lib/netlist/devices/net_lib.cpp", MAME_DIR .. "src/lib/netlist/devices/net_lib.h", MAME_DIR .. "src/lib/netlist/devices/nld_9316_base.hxx", @@ -183,7 +193,6 @@ project "netlist" MAME_DIR .. "src/lib/netlist/devices/nld_am2847.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_dm9314.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_9321.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_ne555.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_r2r_dac.cpp", diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index de88965e478..979f9fd0e49 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -1128,7 +1128,6 @@ files { MAME_DIR .. "src/mame/machine/asteroid.cpp", MAME_DIR .. "src/mame/audio/asteroid.cpp", MAME_DIR .. "src/mame/audio/llander.cpp", - MAME_DIR .. "src/mame/audio/llander.h", MAME_DIR .. "src/mame/drivers/atarifb.cpp", MAME_DIR .. "src/mame/includes/atarifb.h", MAME_DIR .. "src/mame/machine/atarifb.cpp", @@ -3639,13 +3638,9 @@ files { MAME_DIR .. "src/mame/video/vicdual-97269pb.cpp", MAME_DIR .. "src/mame/video/vicdual-97269pb.h", MAME_DIR .. "src/mame/audio/carnival.cpp", - MAME_DIR .. "src/mame/audio/carnival.h", MAME_DIR .. "src/mame/audio/depthch.cpp", - MAME_DIR .. "src/mame/audio/depthch.h", MAME_DIR .. "src/mame/audio/invinco.cpp", - MAME_DIR .. "src/mame/audio/invinco.h", MAME_DIR .. "src/mame/audio/pulsar.cpp", - MAME_DIR .. "src/mame/audio/pulsar.h", MAME_DIR .. "src/mame/drivers/zaxxon.cpp", MAME_DIR .. "src/mame/includes/zaxxon.h", MAME_DIR .. "src/mame/audio/zaxxon.cpp", @@ -3858,7 +3853,6 @@ 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/machine/hng64_net.h", MAME_DIR .. "src/mame/video/hng64_3d.hxx", MAME_DIR .. "src/mame/video/hng64_sprite.hxx", MAME_DIR .. "src/mame/drivers/lasso.cpp", @@ -4746,7 +4740,6 @@ files { createMAMEProjects(_target, _subtarget, "misc") files { MAME_DIR .. "src/mame/drivers/39in1.cpp", - MAME_DIR .. "src/mame/machine/pxa255.h", MAME_DIR .. "src/mame/drivers/3do.cpp", MAME_DIR .. "src/mame/includes/3do.h", MAME_DIR .. "src/mame/machine/3do.cpp", diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 42c2bc8409f..58c65de5c4a 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1665,13 +1665,11 @@ files { MAME_DIR .. "src/mame/drivers/super6.cpp", MAME_DIR .. "src/mame/includes/super6.h", MAME_DIR .. "src/mame/drivers/superslave.cpp", - MAME_DIR .. "src/mame/includes/superslave.h", } createMESSProjects(_target, _subtarget, "agat") files { MAME_DIR .. "src/mame/drivers/agat.cpp", - MAME_DIR .. "src/mame/includes/apple2.h", MAME_DIR .. "src/mame/machine/agatkeyb.cpp", MAME_DIR .. "src/mame/machine/agatkeyb.h", MAME_DIR .. "src/mame/video/agat7.cpp", @@ -1855,7 +1853,7 @@ files { createMESSProjects(_target, _subtarget, "atari") files { - MAME_DIR .. "src/mame/drivers/a2600.h", + MAME_DIR .. "src/mame/includes/a2600.h", MAME_DIR .. "src/mame/drivers/a2600.cpp", MAME_DIR .. "src/mame/drivers/a7800.cpp", MAME_DIR .. "src/mame/video/maria.cpp", @@ -2199,7 +2197,6 @@ files { MAME_DIR .. "src/mame/drivers/nanos.cpp", MAME_DIR .. "src/mame/drivers/pcm.cpp", MAME_DIR .. "src/mame/drivers/vcs80.cpp", - MAME_DIR .. "src/mame/includes/vcs80.h", MAME_DIR .. "src/mame/machine/k7659kb.cpp", MAME_DIR .. "src/mame/machine/k7659kb.h", } @@ -2507,7 +2504,7 @@ files { createMESSProjects(_target, _subtarget, "h01x") files { - MAME_DIR .. "src/mame/include/h01x.h", + MAME_DIR .. "src/mame/includes/h01x.h", MAME_DIR .. "src/mame/drivers/h01x.cpp", MAME_DIR .. "src/mame/video/h01x.cpp", } @@ -2836,11 +2833,8 @@ files { MAME_DIR .. "src/mame/drivers/abc80x.cpp", MAME_DIR .. "src/mame/includes/abc80x.h", MAME_DIR .. "src/mame/video/abc800.cpp", - MAME_DIR .. "src/mame/video/abc800.h", MAME_DIR .. "src/mame/video/abc802.cpp", - MAME_DIR .. "src/mame/video/abc802.h", MAME_DIR .. "src/mame/video/abc806.cpp", - MAME_DIR .. "src/mame/video/abc806.h", MAME_DIR .. "src/mame/drivers/abc1600.cpp", MAME_DIR .. "src/mame/includes/abc1600.h", MAME_DIR .. "src/mame/machine/abc1600mac.cpp", @@ -3212,7 +3206,6 @@ files { createMESSProjects(_target, _subtarget, "omnibyte") files { MAME_DIR .. "src/mame/drivers/msbc1.cpp", - MAME_DIR .. "src/mame/includes/msbc1.h", MAME_DIR .. "src/mame/drivers/ob68k1a.cpp", MAME_DIR .. "src/mame/includes/ob68k1a.h", } @@ -3663,7 +3656,6 @@ files { MAME_DIR .. "src/mame/machine/pce220_ser.h", MAME_DIR .. "src/mame/drivers/mz6500.cpp", MAME_DIR .. "src/mame/drivers/zaurus.cpp", - MAME_DIR .. "src/mame/machine/pxa255.h", MAME_DIR .. "src/mame/drivers/fontwriter.cpp", } @@ -3754,7 +3746,6 @@ files { createMESSProjects(_target, _subtarget, "sord") files { MAME_DIR .. "src/mame/drivers/m5.cpp", - MAME_DIR .. "src/mame/includes/m5.h", } createMESSProjects(_target, _subtarget, "special") @@ -4316,7 +4307,6 @@ files { MAME_DIR .. "src/mame/drivers/bullet.cpp", MAME_DIR .. "src/mame/includes/bullet.h", MAME_DIR .. "src/mame/drivers/jupiter.cpp", - MAME_DIR .. "src/mame/includes/jupiter.h", } createMESSProjects(_target, _subtarget, "wyse")