From 3b52cad24351f02dfa9d4888827fe892d59cf506 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Fri, 17 Jul 2020 14:00:00 +0530 Subject: [PATCH] fix clang errors File changes: * meson.build: add -Wno-unused-private-field and -Wno-microsoft-exception-spec option to suppress clang compiler warnings * d3d9/d3d9_swvp_emu.h: include unordered_map for std::unordered_map --- meson.build | 9 +++++++++ src/d3d9/d3d9_swvp_emu.h | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a24989d3..0ed71d23 100644 --- a/meson.build +++ b/meson.build @@ -17,6 +17,15 @@ if dxvk_compiler.get_id() == 'msvc' add_project_arguments('/std:' + dxvk_cpp_std, language : 'cpp') endif +if dxvk_compiler.get_id() == 'clang' + if dxvk_compiler.has_argument('-Wno-unused-private-field') + add_project_arguments('-Wno-unused-private-field', language: 'cpp') + endif + if dxvk_compiler.has_argument('-Wno-microsoft-exception-spec') + add_project_arguments('-Wno-microsoft-exception-spec', language: 'cpp') + endif +endif + dxvk_include_path = include_directories('./include') if (cpu_family == 'x86_64') diff --git a/src/d3d9/d3d9_swvp_emu.h b/src/d3d9/d3d9_swvp_emu.h index 397bd83b..cb39a3c2 100644 --- a/src/d3d9/d3d9_swvp_emu.h +++ b/src/d3d9/d3d9_swvp_emu.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "d3d9_include.h" #include "../dxvk/dxvk_shader.h" @@ -33,4 +35,4 @@ namespace dxvk { }; -} \ No newline at end of file +}