From 47606f4339d8ef2597f45b2f3a00b0bff5d98adc Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Wed, 3 Mar 2021 17:50:40 +0000
Subject: [PATCH] build: Rename vkd3d_msvc and vkd3d_clang

Signed-off-by: Joshua Ashton <joshua@froggi.es>
---
 libs/d3d12/meson.build       | 2 +-
 libs/vkd3d-utils/meson.build | 2 +-
 meson.build                  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/d3d12/meson.build b/libs/d3d12/meson.build
index ef9b9d8a..c716305b 100644
--- a/libs/d3d12/meson.build
+++ b/libs/d3d12/meson.build
@@ -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 ])
 
diff --git a/libs/vkd3d-utils/meson.build b/libs/vkd3d-utils/meson.build
index 306256c5..677fecdf 100644
--- a/libs/vkd3d-utils/meson.build
+++ b/libs/vkd3d-utils/meson.build
@@ -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',
diff --git a/meson.build b/meson.build
index 9de2d622..3ad22a6b 100644
--- a/meson.build
+++ b/meson.build
@@ -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