configure: Use VULKAN_LIBS when looking for the Vulkan library.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Matteo Bruni 2021-03-21 21:44:38 +01:00 committed by Alexandre Julliard
parent 9007df1067
commit 8c01e98650

View File

@ -105,17 +105,20 @@ AC_CHECK_LIB([dl], [dlopen],
AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads]) AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
VKD3D_CHECK_PTHREAD VKD3D_CHECK_PTHREAD
AC_SUBST([VULKAN_LIBS]) AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
[VULKAN_LIBS="-lvulkan"], [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"],
[VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr], [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
[VULKAN_LIBS="-lvulkan-1" [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-1"
AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])], AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])],
[VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
[VULKAN_LIBS="-lMoltenVK" [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK"
AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
["$ac_cv_lib_soname_MoltenVK"])], ["$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])
AS_IF([test "x$with_ncurses" != "xno"], AS_IF([test "x$with_ncurses" != "xno"],
[PKG_CHECK_MODULES([NCURSES], [ncurses], [PKG_CHECK_MODULES([NCURSES], [ncurses],