summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2021-06-23 11:28:02 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2021-06-23 11:28:02 +1000
commitcf7728c87e0dc626ca15822ba48221d797b1944f (patch)
treebb6a228496aec11af4c05c997161e75d55d75e04 /scripts/src
parentdb3a2c6380728c06a0afa5443b77d148fb752718 (diff)
parent188a28c9ff09ab95beb0427c8ea1b37dd512e6c1 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/emu.lua5
-rw-r--r--scripts/src/machine.lua12
2 files changed, 13 insertions, 4 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 6746847ef2a..dd24030e72d 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -111,8 +111,6 @@ files {
MAME_DIR .. "src/emu/driver.h",
MAME_DIR .. "src/emu/drivenum.cpp",
MAME_DIR .. "src/emu/drivenum.h",
- MAME_DIR .. "src/emu/emualloc.cpp",
- MAME_DIR .. "src/emu/emualloc.h",
MAME_DIR .. "src/emu/emucore.cpp",
MAME_DIR .. "src/emu/emucore.h",
MAME_DIR .. "src/emu/emumem.cpp",
@@ -268,8 +266,7 @@ files {
}
pchsource(MAME_DIR .. "src/emu/main.cpp")
--- 3 files do not include emu.h
-nopch(MAME_DIR .. "src/emu/emualloc.cpp")
+-- 2 files do not include emu.h
nopch(MAME_DIR .. "src/emu/attotime.cpp")
nopch(MAME_DIR .. "src/emu/debug/textbuf.cpp")
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 76738b17b7f..f474b7e9f0d 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -1199,6 +1199,18 @@ end
---------------------------------------------------
--
+--@src/devices/machine/ds2404.h,MACHINES["DS6417"] = true
+---------------------------------------------------
+
+if (MACHINES["DS6417"]~=null) then
+ files {
+ MAME_DIR .. "src/devices/machine/ds6417.cpp",
+ MAME_DIR .. "src/devices/machine/ds6417.h",
+ }
+end
+
+---------------------------------------------------
+--
--@src/devices/machine/ds75160a.h,MACHINES["DS75160A"] = true
---------------------------------------------------