rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-01 07:24:12 +01:00
Code Issues Projects Releases Wiki Activity

fix clang errors

Browse Source 
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
This commit is contained in:
Biswapriyo Nath 2020-07-17 14:00:00 +05:30 committed by Philip Rebohle
parent 76e3bb78c9
commit 3b52cad243
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -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')

4
src/d3d9/d3d9_swvp_emu.h
View File

@ -1,5 +1,7 @@
#pragma once
#include <unordered_map>
#include "d3d9_include.h"
#include "../dxvk/dxvk_shader.h"
@ -33,4 +35,4 @@ namespace dxvk {
};
}
}