summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2021-02-28 17:40:07 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2021-02-28 17:40:07 +1100
commit21c2bc8757a9229df49eb2f6f3129ef8845fe490 (patch)
tree7b06743a1e29af34dc043ae44523e282abb165b9 /scripts/src
parent954b2749b8e6b76c5510acecba989e0b0d112c37 (diff)
parentd0ffaeeeec58e5e7e80f6bf0950254b94eef586b (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/mame/drivers/model2.cpp
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/cpu.lua17
-rw-r--r--scripts/src/sound.lua51
2 files changed, 43 insertions, 25 deletions
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 0ca72a6b3d7..db6c6853f4d 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -3482,3 +3482,20 @@ if (CPUS["LC57"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lc57/lc57d.cpp")
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lc57/lc57d.h")
end
+
+--------------------------------------------------
+-- Mark I (Andrew Holme)
+--@src/devices/cpu/mk1/mk1.h,CPUS["MK1"] = true
+--------------------------------------------------
+
+if (CPUS["MK1"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/cpu/mk1/mk1.cpp",
+ MAME_DIR .. "src/devices/cpu/mk1/mk1.h",
+ }
+end
+
+if (CPUS["MK1"]~=null or _OPTIONS["with-tools"]) then
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mk1/mk1dasm.cpp")
+ table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mk1/mk1dasm.h")
+end
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index a9b35f65675..1d6bed6ddb1 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -1170,11 +1170,11 @@ end
---------------------------------------------------
-- Yamaha FM synthesizers
--@src/devices/sound/ym2151.h,SOUNDS["YM2151"] = true
---@src/devices/sound/2203intf.h,SOUNDS["YM2203"] = true
+--@src/devices/sound/ym2203.h,SOUNDS["YM2203"] = true
--@src/devices/sound/ym2413.h,SOUNDS["YM2413"] = true
---@src/devices/sound/2608intf.h,SOUNDS["YM2608"] = true
---@src/devices/sound/2610intf.h,SOUNDS["YM2610"] = true
---@src/devices/sound/2612intf.h,SOUNDS["YM2612"] = true
+--@src/devices/sound/ym2608.h,SOUNDS["YM2608"] = true
+--@src/devices/sound/ym2610.h,SOUNDS["YM2610"] = true
+--@src/devices/sound/ym2612.h,SOUNDS["YM2612"] = true
--@src/devices/sound/3812intf.h,SOUNDS["YM3812"] = true
--@src/devices/sound/3526intf.h,SOUNDS["YM3526"] = true
--@src/devices/sound/8950intf.h,SOUNDS["Y8950"] = true
@@ -1188,6 +1188,8 @@ if (SOUNDS["YM2151"]~=null) then
files {
MAME_DIR .. "src/devices/sound/ym2151.cpp",
MAME_DIR .. "src/devices/sound/ym2151.h",
+ MAME_DIR .. "src/devices/sound/ymfm.cpp",
+ MAME_DIR .. "src/devices/sound/ymfm.h",
}
end
@@ -1201,49 +1203,48 @@ end
if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
--if (SOUNDS["YM2203"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2203intf.cpp",
- MAME_DIR .. "src/devices/sound/2203intf.h",
MAME_DIR .. "src/devices/sound/ay8910.cpp",
MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
+ MAME_DIR .. "src/devices/sound/ym2203.cpp",
+ MAME_DIR .. "src/devices/sound/ym2203.h",
+ MAME_DIR .. "src/devices/sound/ymfm.cpp",
+ MAME_DIR .. "src/devices/sound/ymfm.h",
}
--end
--if (SOUNDS["YM2608"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2608intf.cpp",
- MAME_DIR .. "src/devices/sound/2608intf.h",
MAME_DIR .. "src/devices/sound/ay8910.cpp",
MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
- MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
- MAME_DIR .. "src/devices/sound/ymdeltat.h",
+ MAME_DIR .. "src/devices/sound/ym2608.cpp",
+ MAME_DIR .. "src/devices/sound/ym2608.h",
+ MAME_DIR .. "src/devices/sound/ymadpcm.cpp",
+ MAME_DIR .. "src/devices/sound/ymadpcm.h",
+ MAME_DIR .. "src/devices/sound/ymfm.cpp",
+ MAME_DIR .. "src/devices/sound/ymfm.h",
}
--end
--if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2610intf.cpp",
- MAME_DIR .. "src/devices/sound/2610intf.h",
MAME_DIR .. "src/devices/sound/ay8910.cpp",
MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm.cpp",
- MAME_DIR .. "src/devices/sound/fm.h",
- MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
- MAME_DIR .. "src/devices/sound/ymdeltat.h",
+ MAME_DIR .. "src/devices/sound/ym2610.cpp",
+ MAME_DIR .. "src/devices/sound/ym2610.h",
+ MAME_DIR .. "src/devices/sound/ymadpcm.cpp",
+ MAME_DIR .. "src/devices/sound/ymadpcm.h",
+ MAME_DIR .. "src/devices/sound/ymfm.cpp",
+ MAME_DIR .. "src/devices/sound/ymfm.h",
}
--end
--if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
files {
- MAME_DIR .. "src/devices/sound/2612intf.cpp",
- MAME_DIR .. "src/devices/sound/2612intf.h",
- MAME_DIR .. "src/devices/sound/ay8910.cpp",
- MAME_DIR .. "src/devices/sound/ay8910.h",
- MAME_DIR .. "src/devices/sound/fm2612.cpp",
+ MAME_DIR .. "src/devices/sound/ym2612.cpp",
+ MAME_DIR .. "src/devices/sound/ym2612.h",
+ MAME_DIR .. "src/devices/sound/ymfm.cpp",
+ MAME_DIR .. "src/devices/sound/ymfm.h",
}
--end
end