diff options
author | 2020-06-23 19:48:01 +1000 | |
---|---|---|
committer | 2020-06-23 19:48:01 +1000 | |
commit | 60761a0d8171ce971e62566a7ffe9f77c200881f (patch) | |
tree | 3db2436ce33bdd8373c3c6b489e8042d4a1b2ec8 /scripts/src | |
parent | feda349b3eea19d4fd0010a74e2dd6ff30f26b16 (diff) | |
parent | d1362259ee3a0791689ef2a754f5b730a9afcd6e (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/cpu.lua | 2 | ||||
-rw-r--r-- | scripts/src/formats.lua | 12 | ||||
-rw-r--r-- | scripts/src/machine.lua | 12 |
3 files changed, 14 insertions, 12 deletions
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 6bd787f0036..0dcc83b6855 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -2575,6 +2575,8 @@ if (CPUS["TLCS900"]~=null) then MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c061.h", MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c063.cpp", MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c063.h", + MAME_DIR .. "src/devices/cpu/tlcs900/tmp96c141.cpp", + MAME_DIR .. "src/devices/cpu/tlcs900/tmp96c141.h", } end diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua index 9fa678257cb..f168dbe81ca 100644 --- a/scripts/src/formats.lua +++ b/scripts/src/formats.lua @@ -619,18 +619,6 @@ end -------------------------------------------------- -- ---@src/lib/formats/d40_dsk.h,FORMATS["D40_DSK"] = true --------------------------------------------------- - -if (FORMATS["D40_DSK"]~=null or _OPTIONS["with-tools"]) then - files { - MAME_DIR.. "src/lib/formats/d40_dsk.cpp", - MAME_DIR.. "src/lib/formats/d40_dsk.h", - } -end - --------------------------------------------------- --- --@src/lib/formats/d80_dsk.h,FORMATS["D80_DSK"] = true -------------------------------------------------- diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 3e6f69e64d6..aac89b8c964 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -2758,6 +2758,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/sa1110.h,MACHINES["SA1110"] = true +--------------------------------------------------- + +if (MACHINES["SA1110"]~=null) then + files { + MAME_DIR .. "src/devices/machine/sa1110.cpp", + MAME_DIR .. "src/devices/machine/sa1110.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/saa1043.h,MACHINES["SAA1043"] = true --------------------------------------------------- |