Zebediah Figura : configure: Remove the no longer used check for VULKAN_LIBS.
Alexandre Julliard
julliard at winehq.org
Mon Apr 25 16:08:49 CDT 2022
Module: vkd3d
Branch: master
Commit: 99a3adcc19f2a64fad630948851616f52c00d553
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=99a3adcc19f2a64fad630948851616f52c00d553
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Fri Apr 22 15:18:00 2022 -0500
configure: Remove the no longer used check for VULKAN_LIBS.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure.ac | 1 -
m4/check-vulkan.m4 | 16 ++++++----------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index a58e453f..5250103c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,6 @@ case $host_os in
;;
esac
-AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
VKD3D_CHECK_VULKAN
AS_IF([test "x$with_ncurses" != "xno"],
diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4
index 756f61a0..b2c3f8a1 100644
--- a/m4/check-vulkan.m4
+++ b/m4/check-vulkan.m4
@@ -1,16 +1,12 @@
dnl VKD3D_CHECK_VULKAN
AC_DEFUN([VKD3D_CHECK_VULKAN],[
-VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
- [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"],
+VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],,
[VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
- [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],
- [VULKAN_LIBS="$VULKAN_LIBS -lMoltenVK"
- AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
+ [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
["$ac_cv_lib_soname_MoltenVK"])],
- [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])],
- [$VULKAN_LIBS])],
- [$VULKAN_LIBS])],
- [$VULKAN_LIBS])
+ [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])
+ ])
+ ])
])
More information about the wine-cvs
mailing list