diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2019-11-25 16:41:43 +0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-25 14:04:43 +0200 |
| commit | 7677a38e1a8679b44a818bf3782a3fa6472e17f8 (patch) | |
| tree | 88b5bbd51d6cb57b5fdefcc3c95e59ac4eceb3d5 /mesonbuild/dependencies/ui.py | |
| parent | 07a2fe2f00122b514a5119b724581ea020d2c6ea (diff) | |
| download | meson-7677a38e1a8679b44a818bf3782a3fa6472e17f8.zip meson-7677a38e1a8679b44a818bf3782a3fa6472e17f8.tar.gz meson-7677a38e1a8679b44a818bf3782a3fa6472e17f8.tar.bz2 | |
dependencies/ui.py: Fix Vulkan detection on Windows
We might be using the 32-bit bits of the VulkanSDK on Windows on x64
Windows, so we still need to pass in the compiler items to detect what
architecture we are building for, so that we link to the correct Vulkan
libraries.
We might want to look into this again if Microsoft will allow ARM/ARM64
versions of the Vulkan drivers and SDK, since post-basic OpenGL and
any Vulkan are not supported on Windows-on-ARM.
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 6d784e6..638bc68 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -25,7 +25,7 @@ from .. import mesonlib from ..mesonlib import ( MesonException, Popen_safe, extract_as_list, version_compare_many ) -from ..environment import detect_cpu +from ..environment import detect_cpu_family from .base import DependencyException, DependencyMethods from .base import ExternalDependency, ExternalProgram, NonExistingExternalProgram @@ -609,7 +609,7 @@ class VulkanDependency(ExternalDependency): lib_name = 'vulkan-1' lib_dir = 'Lib32' inc_dir = 'Include' - if detect_cpu({}) == 'x86_64': + if detect_cpu_family(self.env.coredata.compilers.host) == 'x86_64': lib_dir = 'Lib' else: lib_name = 'vulkan' |