summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2021-08-22 15:52:44 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2021-08-22 15:52:44 +1000
commitecfbfef65e0b18769544bc23f9d50dab07dfd0dd (patch)
tree124d3b471a14a26ff343a13a6847fb52515f9039 /scripts/src
parentee9e84ae09ca8d31a57600821a9c06576ff3b8a1 (diff)
parente8bbea1fc6e94e14768509d322f6c624403ffb36 (diff)
Merge remote-tracking branch 'upstream/master'
# Conflicts: # src/emu/machine.cpp # src/frontend/mame/ui/inifile.cpp
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--scripts/src/formats.lua2
-rw-r--r--scripts/src/lib.lua9
-rw-r--r--scripts/src/osd/mac.lua1
-rw-r--r--scripts/src/osd/sdl.lua1
5 files changed, 11 insertions, 4 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 08ea4a8ff5d..cca26b543e0 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1104,6 +1104,8 @@ if (BUSES["ELECTRON"]~=null) then
MAME_DIR .. "src/devices/bus/electron/fbjoy.h",
MAME_DIR .. "src/devices/bus/electron/fbprint.cpp",
MAME_DIR .. "src/devices/bus/electron/fbprint.h",
+ MAME_DIR .. "src/devices/bus/electron/mc68k.cpp",
+ MAME_DIR .. "src/devices/bus/electron/mc68k.h",
MAME_DIR .. "src/devices/bus/electron/mode7.cpp",
MAME_DIR .. "src/devices/bus/electron/mode7.h",
MAME_DIR .. "src/devices/bus/electron/plus1.cpp",
diff --git a/scripts/src/formats.lua b/scripts/src/formats.lua
index 5afef69d522..d2c7ceda4a5 100644
--- a/scripts/src/formats.lua
+++ b/scripts/src/formats.lua
@@ -33,8 +33,6 @@ project "formats"
MAME_DIR .. "src/lib/formats/all.cpp",
MAME_DIR .. "src/lib/formats/all.h",
- MAME_DIR .. "src/lib/formats/ioprocs.cpp",
- MAME_DIR .. "src/lib/formats/ioprocs.h",
MAME_DIR .. "src/lib/formats/imageutl.cpp",
MAME_DIR .. "src/lib/formats/imageutl.h",
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index c943656ca14..c24bb015cd4 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -71,6 +71,12 @@ project "utils"
MAME_DIR .. "src/lib/util/hashing.h",
MAME_DIR .. "src/lib/util/huffman.cpp",
MAME_DIR .. "src/lib/util/huffman.h",
+ MAME_DIR .. "src/lib/util/ioprocs.cpp",
+ MAME_DIR .. "src/lib/util/ioprocs.h",
+ MAME_DIR .. "src/lib/util/ioprocsfill.h",
+ MAME_DIR .. "src/lib/util/ioprocsfilter.cpp",
+ MAME_DIR .. "src/lib/util/ioprocsfilter.h",
+ MAME_DIR .. "src/lib/util/ioprocsvec.h",
MAME_DIR .. "src/lib/util/jedparse.cpp",
MAME_DIR .. "src/lib/util/jedparse.h",
MAME_DIR .. "src/lib/util/md5.cpp",
@@ -85,6 +91,8 @@ project "utils"
MAME_DIR .. "src/lib/util/options.h",
MAME_DIR .. "src/lib/util/palette.cpp",
MAME_DIR .. "src/lib/util/palette.h",
+ MAME_DIR .. "src/lib/util/path.cpp",
+ MAME_DIR .. "src/lib/util/path.h",
MAME_DIR .. "src/lib/util/path_to_regex.cpp",
MAME_DIR .. "src/lib/util/path_to_regex.hpp",
MAME_DIR .. "src/lib/util/plaparse.cpp",
@@ -104,6 +112,7 @@ project "utils"
MAME_DIR .. "src/lib/util/unzip.cpp",
MAME_DIR .. "src/lib/util/unzip.h",
MAME_DIR .. "src/lib/util/un7z.cpp",
+ MAME_DIR .. "src/lib/util/utilfwd.h",
MAME_DIR .. "src/lib/util/vbiparse.cpp",
MAME_DIR .. "src/lib/util/vbiparse.h",
MAME_DIR .. "src/lib/util/vecstream.cpp",
diff --git a/scripts/src/osd/mac.lua b/scripts/src/osd/mac.lua
index 2cc3e53c926..8a57b4ab4a3 100644
--- a/scripts/src/osd/mac.lua
+++ b/scripts/src/osd/mac.lua
@@ -166,7 +166,6 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/lib/osdlib_macosx.cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib.h",
MAME_DIR .. "src/osd/modules/file/posixdir.cpp",
- MAME_DIR .. "src/osd/modules/file/posixdomain.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.h",
MAME_DIR .. "src/osd/modules/file/posixptty.cpp",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 37dfb221067..31dafbbeb20 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -482,7 +482,6 @@ project ("ocore_" .. _OPTIONS["osd"])
if BASE_TARGETOS=="unix" then
files {
MAME_DIR .. "src/osd/modules/file/posixdir.cpp",
- MAME_DIR .. "src/osd/modules/file/posixdomain.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.cpp",
MAME_DIR .. "src/osd/modules/file/posixfile.h",
MAME_DIR .. "src/osd/modules/file/posixptty.cpp",