diff options
| author | Asahi Lina <lina@asahilina.net> | 2023-02-02 12:16:01 +0900 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-02-05 09:15:48 +0000 |
| commit | 4ca4a05627e40e8212a8ea957f8ef2f697e4e322 (patch) | |
| tree | edc2a8f94eb3b812b08205f51eadf8efd03a73e4 | |
| parent | bfa7ec0aa0f317011c4573e4d4ce4d4aabe9bf07 (diff) | |
meson: Fix Asahi build on macOS
!19950 introduced a dependency between NIR and Vulkan headers, and the
Vulkan headers try to include X11 headers we cannot find on macOS.
Disable this (we have no plans for Vulkan on the macOS testing platform
anyway).
Signed-off-by: Asahi Lina <lina@asahilina.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21059>
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 3f60316b063..c0e2ab3cfdf 100644 --- a/meson.build +++ b/meson.build @@ -364,7 +364,7 @@ if with_platform_wayland #add this once aco and other places can build with it #cpp_args += '-DVK_USE_PLATFORM_WAYLAND_KHR' endif -if with_platform_x11 +if with_platform_x11 and host_machine.system() != 'darwin' c_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] #add this once aco and other places can build with it #cpp_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] |