configure: Allow specifying the Vulkan library path with VULKAN_LIBS.

Do not define it for the vkd3d build, but restore support for overriding it as a
configure argument.

This partially reverts 99a3adcc19.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-04-27 11:26:06 -05:00 committed by Alexandre Julliard
parent cf7cf05cb7
commit f34db84c62
2 changed files with 5 additions and 3 deletions

View File

@ -113,6 +113,7 @@ case $host_os in
esac
AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library])
AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
AS_IF([test "x$SONAME_LIBVULKAN" = "x"],
[VKD3D_CHECK_VULKAN],
[AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])])

View File

@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],,
[VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
[AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
["$ac_cv_lib_soname_MoltenVK"])],
[AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])
])
])
[AC_MSG_ERROR([libvulkan and libMoltenVK not found.])],
[$VULKAN_LIBS])],
[$VULKAN_LIBS])],
[$VULKAN_LIBS])
])