diff options
author | 2021-11-01 01:01:57 +1100 | |
---|---|---|
committer | 2021-11-01 01:01:57 +1100 | |
commit | dafe686e7b09169b8fdd23cba1e586bb547d9f41 (patch) | |
tree | 7723a80705a4f7e75c8998c77dea8abaae76a010 /scripts/src | |
parent | 9a6f885f559d73db178a964a018dd838d39426bb (diff) | |
parent | 96cbadbd7d3a4bc81c6d1888abb50e32622d3973 (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# src/frontend/mame/ui/about.cpp
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/lib.lua | 2 | ||||
-rw-r--r-- | scripts/src/mame/frontend.lua | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua index 6b1bd29e3ea..1cb1ce50f60 100644 --- a/scripts/src/lib.lua +++ b/scripts/src/lib.lua @@ -89,6 +89,8 @@ end 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/language.cpp", + MAME_DIR .. "src/lib/util/language.h", MAME_DIR .. "src/lib/util/lrucache.h", MAME_DIR .. "src/lib/util/md5.cpp", MAME_DIR .. "src/lib/util/md5.h", diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua index 91d60cf6587..f3ebbc0d74c 100644 --- a/scripts/src/mame/frontend.lua +++ b/scripts/src/mame/frontend.lua @@ -171,6 +171,8 @@ files { MAME_DIR .. "src/frontend/mame/ui/tapectrl.h", MAME_DIR .. "src/frontend/mame/ui/text.cpp", MAME_DIR .. "src/frontend/mame/ui/text.h", + MAME_DIR .. "src/frontend/mame/ui/textbox.cpp", + MAME_DIR .. "src/frontend/mame/ui/textbox.h", MAME_DIR .. "src/frontend/mame/ui/toolbar.ipp", MAME_DIR .. "src/frontend/mame/ui/ui.cpp", MAME_DIR .. "src/frontend/mame/ui/ui.h", |