Henri Verbeet : build: Try "vulkan-1" as the Vulkan library.
Alexandre Julliard
julliard at winehq.org
Thu Aug 13 15:11:12 CDT 2020
Module: vkd3d
Branch: master
Commit: 9a2b3bac58653337f8bfd71f7e4b5e1216a9b901
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9a2b3bac58653337f8bfd71f7e4b5e1216a9b901
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Aug 13 17:55:37 2020 +0430
build: Try "vulkan-1" as the Vulkan library.
Somewhat unconventionally, the official Vulkan import library is called
"vulkan-1.lib" on Windows.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure.ac | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 355aaab..ca9d760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,10 +96,14 @@ VKD3D_CHECK_PTHREAD
AC_SUBST([VULKAN_LIBS])
VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
[VULKAN_LIBS="-lvulkan"],
- [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
- [VULKAN_LIBS="-lMoltenVK"
- AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])],
- [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])
+ [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
+ [VULKAN_LIBS="-lvulkan-1"
+ AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])],
+ [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
+ [VULKAN_LIBS="-lMoltenVK"
+ AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
+ ["$ac_cv_lib_soname_MoltenVK"])],
+ [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])])
AS_IF([test "x$with_spirv_tools" = "xyes"],
[PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared],
More information about the wine-cvs
mailing list