summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2021-09-04 20:08:53 +0100
committer smf- <smf-@users.noreply.github.com>2021-09-04 20:09:51 +0100
commit32267e4852c2b8f7391066d6adea18845638e920 (patch)
tree4b5aa4d86e4c223f30be6742e9cd74d365eab18d
parentcdaf97cafbb68659c3da38c9d173727ac2b7b870 (diff)
fixes for building with clang 12.0.1 on windows
-rw-r--r--scripts/src/3rdparty.lua1
-rw-r--r--scripts/src/osd/windows.lua4
-rw-r--r--src/osd/modules/input/input_dinput.cpp3
-rw-r--r--src/osd/modules/input/input_dinput.h1
4 files changed, 6 insertions, 3 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 78d73248623..8d43705345a 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1390,6 +1390,7 @@ end
"-Wno-unknown-attributes",
"-Wno-missing-braces",
"-Wno-int-to-pointer-cast",
+ "-Wno-ignored-attributes", -- many instances in ImGui
}
end
end
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index cefe6234cf3..9bd9b6cd5f6 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -119,6 +119,10 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows",
}
+ buildoptions_cpp {
+ "-Wno-ignored-attributes",-- many instances in ImGui
+ }
+
files {
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
diff --git a/src/osd/modules/input/input_dinput.cpp b/src/osd/modules/input/input_dinput.cpp
index 57a84fab225..8ceb29e21f4 100644
--- a/src/osd/modules/input/input_dinput.cpp
+++ b/src/osd/modules/input/input_dinput.cpp
@@ -550,8 +550,7 @@ int dinput_joystick_device::configure()
//============================================================
dinput_api_helper::dinput_api_helper()
- : m_dinput(nullptr),
- m_dinput_create_prt(nullptr)
+ : m_dinput(nullptr)
{
}
diff --git a/src/osd/modules/input/input_dinput.h b/src/osd/modules/input/input_dinput.h
index 8d983799fcb..8600e73a04d 100644
--- a/src/osd/modules/input/input_dinput.h
+++ b/src/osd/modules/input/input_dinput.h
@@ -46,7 +46,6 @@ class dinput_api_helper
private:
Microsoft::WRL::ComPtr<IDirectInput8> m_dinput;
osd::dynamic_module::ptr m_dinput_dll;
- dinput_create_fn m_dinput_create_prt;
public:
dinput_api_helper();