summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2021-09-11 02:56:17 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2021-09-11 02:56:17 +1000
commit2fb49bb834885bdba43d350281f16bcdda4a50b9 (patch)
treeeb35af21b7e2910e23f962855cbf1db4a1743c2c /scripts/src
parent2a567f3a70292666bc7708368a95d24eea2c86a0 (diff)
parenta99d2f3295c21e6ae97cbffce8cf025860bfa4d6 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/osd/windows.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 9bd9b6cd5f6..2f77844d17a 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -119,9 +119,11 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows",
}
- buildoptions_cpp {
- "-Wno-ignored-attributes",-- many instances in ImGui
- }
+ if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then
+ buildoptions_cpp {
+ "-Wno-ignored-attributes",-- many instances in ImGui
+ }
+ end
files {
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",