Mesa (master): lavapipe: fix icd generation for windows

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 611e9f29e2fa9b62e54e8853cbf165584f23b1a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=611e9f29e2fa9b62e54e8853cbf165584f23b1a2

Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Feb 21 18:01:59 2021 -0800

lavapipe: fix icd generation for windows

Acked-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9208>

---

 src/gallium/targets/lavapipe/meson.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build
index 55c227d5e40..3ec46c17d04 100644
--- a/src/gallium/targets/lavapipe/meson.build
+++ b/src/gallium/targets/lavapipe/meson.build
@@ -11,10 +11,11 @@ libvulkan_lvp = shared_library(
   install : true,
 )
 
+icd_file_name = 'libvulkan_lvp.so'
+module_dir = join_paths(get_option('prefix'), get_option('libdir'))
 if with_platform_windows
   module_dir = join_paths(get_option('prefix'), get_option('bindir'))
-else
-  module_dir = join_paths(get_option('prefix'), get_option('libdir'))
+  icd_file_name = 'libvulkan_lvp.dll'
 endif
 
 lvp_icd = custom_target(
@@ -24,8 +25,7 @@ lvp_icd = custom_target(
   command : [
     prog_python, '@INPUT0@',
     '--api-version', '1.1', '--xml', '@INPUT1@',
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             'libvulkan_lvp.so'),
+    '--lib-path', join_paths(module_dir, icd_file_name),
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,