Skip to content

Commit

Permalink
fix clang errors
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
Biswa96 authored and doitsujin committed Jul 21, 2020
1 parent 76e3bb7 commit 3b52cad
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
9 changes: 9 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 3 additions & 1 deletion src/d3d9/d3d9_swvp_emu.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <unordered_map>

#include "d3d9_include.h"

#include "../dxvk/dxvk_shader.h"
Expand Down Expand Up @@ -33,4 +35,4 @@ namespace dxvk {

};

}
}

0 comments on commit 3b52cad

Please sign in to comment.