mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Rename vkd3d_msvc and vkd3d_clang 

Signed-off-by: Joshua Ashton <joshua@froggi.es>
This commit is contained in:
Joshua Ashton 2021-03-03 17:50:40 +00:00 committed by Hans-Kristian Arntzen
parent 031ad9e139
commit 47606f4339
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/d3d12/meson.build
View File

@ -7,7 +7,7 @@ d3d12_lib = shared_library('d3d12', d3d12_src,
dependencies : [ vkd3d_dep, lib_dxgi ],
include_directories : vkd3d_private_includes,
install : true,
objects : not vkd3d_msvc ? 'd3d12.def' : [],
objects : not vkd3d_is_msvc ? 'd3d12.def' : [],
vs_module_defs : 'd3d12.def',
override_options : [ 'c_std='+vkd3d_c_std ])

2
libs/vkd3d-utils/meson.build
View File

@ -6,7 +6,7 @@ vkd3d_utils_lib = shared_library('vkd3d-proton-utils', vkd3d_utils_src,
dependencies : vkd3d_dep,
include_directories : vkd3d_private_includes,
install : true,
objects : not vkd3d_msvc and vkd3d_platform == 'windows'
objects : not vkd3d_is_msvc and vkd3d_platform == 'windows'
? 'vkd3d-proton-utils.def'
: [],
vs_module_defs : 'vkd3d-proton-utils.def',

6
meson.build
View File

@ -5,8 +5,8 @@ project('vkd3d-proton', ['c'], version : '2.2', meson_version : '>= 0.49', defau
cpu_family = target_machine.cpu_family()
vkd3d_compiler = meson.get_compiler('c')
vkd3d_msvc = vkd3d_compiler.get_id() == 'msvc'
vkd3d_clang = vkd3d_compiler.get_id() == 'clang'
vkd3d_is_msvc = vkd3d_compiler.get_id() == 'msvc'
vkd3d_is_clang = vkd3d_compiler.get_id() == 'clang'
vkd3d_c_std = 'c11'
vkd3d_platform = target_machine.system()
@ -119,7 +119,7 @@ if cpu_family == 'x86'
# Need to link against libatomic for 64-bit atomic emulation on x86
# when using clang.
if vkd3d_clang
if vkd3d_is_clang
lib_atomic = vkd3d_compiler.find_library('atomic')
vkd3d_extra_libs += lib_atomic
endif