Matteo Bruni : configure: Use VULKAN_LIBS when looking for the Vulkan library.
Alexandre Julliard
julliard at winehq.org
Mon Mar 22 16:48:27 CDT 2021
Module: vkd3d
Branch: master
Commit: 8c01e98650e529c25c7812a508d604774a51f3ab
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8c01e98650e529c25c7812a508d604774a51f3ab
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Sun Mar 21 21:44:38 2021 +0100
configure: Use VULKAN_LIBS when looking for the Vulkan library.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure.ac | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2005c76..5f2f719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,17 +105,20 @@ AC_CHECK_LIB([dl], [dlopen],
AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
VKD3D_CHECK_PTHREAD
-AC_SUBST([VULKAN_LIBS])
+AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
- [VULKAN_LIBS="-lvulkan"],
+ [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"],
[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"])],
[VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
- [VULKAN_LIBS="-lMoltenVK"
+ [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK"
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])
AS_IF([test "x$with_ncurses" != "xno"],
[PKG_CHECK_MODULES([NCURSES], [ncurses],
More information about the wine-cvs
mailing list