diff options
author | 2022-05-23 17:57:06 +1000 | |
---|---|---|
committer | 2022-05-23 17:57:06 +1000 | |
commit | a313b26c1b95c95db087b5f9459d0f683634d53f (patch) | |
tree | 08d15f2669d805e71230fe25fa9e1237c965cb79 /scripts/src | |
parent | adc9da2925676b8e062397397a8e3dbab9d161d9 (diff) | |
parent | ebe11f56ab1c773b49e1ca12b5f49c80bc99acc7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/3rdparty.lua | 2 | ||||
-rw-r--r-- | scripts/src/bus.lua | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 59c3f1b720b..1787fc09ad3 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -2239,7 +2239,7 @@ project "asmjit" buildoptions { "-Wno-maybe-uninitialized", } - end + end configuration { } diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index b4118f17087..4d65e662d14 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -939,6 +939,8 @@ if (BUSES["C64"]~=null) then MAME_DIR .. "src/devices/bus/c64/xl80.h", MAME_DIR .. "src/devices/bus/c64/zaxxon.cpp", MAME_DIR .. "src/devices/bus/c64/zaxxon.h", + MAME_DIR .. "src/devices/bus/c64/z80videopak.cpp", + MAME_DIR .. "src/devices/bus/c64/z80videopak.h", MAME_DIR .. "src/devices/bus/c64/user.cpp", MAME_DIR .. "src/devices/bus/c64/user.h", MAME_DIR .. "src/devices/bus/c64/4dxh.cpp", @@ -4720,6 +4722,8 @@ if (BUSES["MULTIBUS"]~=null) then MAME_DIR .. "src/devices/bus/multibus/cpuap.h", MAME_DIR .. "src/devices/bus/multibus/serad.cpp", MAME_DIR .. "src/devices/bus/multibus/serad.h", + MAME_DIR .. "src/devices/bus/multibus/labtam3232.cpp", + MAME_DIR .. "src/devices/bus/multibus/labtam3232.h", } end |