summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2021-11-21 03:25:53 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2021-11-21 03:25:53 +1100
commit582cc73bdaeac7b14da25468f3d28018df36d5f9 (patch)
tree584a48f441576613f9a06848158d4b70fcd7b08e /scripts/src
parent631236a5ed43585511b0896dd10186c0200c73c6 (diff)
parentc9520eaa1d29181fb216651f1605c5bfa2dce470 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--scripts/src/osd/modules.lua6
2 files changed, 8 insertions, 0 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 09d5be58091..faec58fef07 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2998,6 +2998,8 @@ if (BUSES["NES_CTRL"]~=null) then
MAME_DIR .. "src/devices/bus/nes_ctrl/fcmat.h",
MAME_DIR .. "src/devices/bus/nes_ctrl/hori.cpp",
MAME_DIR .. "src/devices/bus/nes_ctrl/hori.h",
+ MAME_DIR .. "src/devices/bus/nes_ctrl/konamibag.cpp",
+ MAME_DIR .. "src/devices/bus/nes_ctrl/konamibag.h",
MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.cpp",
MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.h",
MAME_DIR .. "src/devices/bus/nes_ctrl/miracle.cpp",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 48f83e126cd..e431bb93d22 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -122,6 +122,12 @@ function osdmodulesbuild()
ext_includedir("asio"),
}
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ buildoptions {
+ "-Wno-unused-private-field",
+ }
+ end
+
if _OPTIONS["targetos"]=="windows" then
includedirs {
MAME_DIR .. "3rdparty/winpcap/Include",