[PATCH vkd3d 1/2] configure: Use VULKAN_LIBS when looking for the Vulkan library.

Matteo Bruni mbruni at codeweavers.com
Sun Mar 21 15:44:38 CDT 2021


Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
v2: Actually preserve the contents of VULKAN_LIBS.

 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],
-- 
2.26.2




More information about the wine-devel mailing list