fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson,windows: Use relative paths in Vulkan ICD manifest files

Browse source 
See https://github.com/msys2/MINGW-packages/issues/16065

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27468>
This commit is contained in:
Luca Bacci 2024-02-05 16:01:00 +01:00 • committed by Marge Bot
parent a1e3c93ff7
commit fe520ecfbf
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -256,6 +256,10 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental')
with_nouveau_vk = _vulkan_drivers.contains('nouveau')
with_any_vk = _vulkan_drivers.length() != 0
if with_any_vk and host_machine.system() == 'windows' and meson.version().version_compare('< 1.3')
error('Vulkan drivers on Windows require meson 1.3 or newer')
endif
with_vk_compiler = [
with_intel_vk,
with_intel_hasvk,

2
src/amd/vulkan/meson.build
View file

@ -246,7 +246,7 @@ endif
icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
icd_file_name = 'libvulkan_radeon.so'
if with_platform_windows
icd_lib_path = join_paths(get_option('prefix'), get_option('bindir'))
icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
icd_file_name = 'vulkan_radeon.dll'
endif

2
src/gallium/targets/lavapipe/meson.build
View file

@ -17,7 +17,7 @@ libvulkan_lvp = shared_library(
icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
icd_file_name = 'libvulkan_lvp.so'
if with_platform_windows
icd_lib_path = join_paths(get_option('prefix'), get_option('bindir'))
icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
icd_file_name = 'vulkan_lvp.dll'
endif

2
src/microsoft/vulkan/meson.build
View file

@ -94,7 +94,7 @@ libvulkan_dzn = shared_library(
icd_file_name = 'libvulkan_dzn.so'
icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
if with_platform_windows
icd_lib_path = join_paths(get_option('prefix'), get_option('bindir'))
icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
icd_file_name = 'vulkan_dzn.dll'
endif

2
src/nouveau/vulkan/meson.build
View file

@ -114,7 +114,7 @@ libvulkan_nouveau = shared_library(
icd_lib_path = join_paths(get_option('prefix'), get_option('libdir'))
icd_file_name = 'libvulkan_nouveau.so'
if with_platform_windows
icd_lib_path = join_paths(get_option('prefix'), get_option('bindir'))
icd_lib_path = import('fs').relative_to(get_option('bindir'), with_vulkan_icd_dir)
icd_file_name = 'vulkan_nouveau.dll'
endif