Matteo Bruni : build: Move Vulkan library detection to m4/check-vulkan.m4.
Alexandre Julliard
julliard at winehq.org
Mon Mar 22 16:48:27 CDT 2021
Module: vkd3d
Branch: master
Commit: 0e504e974a737cf2b5616b9368f1c11e2a0f926c
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e504e974a737cf2b5616b9368f1c11e2a0f926c
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Sun Mar 21 21:44:39 2021 +0100
build: Move Vulkan library detection to m4/check-vulkan.m4.
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 | 14 +-------------
m4/check-vulkan.m4 | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5f2f719..275bca2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,19 +106,7 @@ AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
VKD3D_CHECK_PTHREAD
AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
-VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
- [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"],
- [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
- [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-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_cv_lib_soname_MoltenVK"])],
- [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])],
- [$VULKAN_LIBS])],
- [$VULKAN_LIBS])],
- [$VULKAN_LIBS])
+VKD3D_CHECK_VULKAN
AS_IF([test "x$with_ncurses" != "xno"],
[PKG_CHECK_MODULES([NCURSES], [ncurses],
diff --git a/m4/check-vulkan.m4 b/m4/check-vulkan.m4
new file mode 100644
index 0000000..756f61a
--- /dev/null
+++ b/m4/check-vulkan.m4
@@ -0,0 +1,16 @@
+dnl VKD3D_CHECK_VULKAN
+AC_DEFUN([VKD3D_CHECK_VULKAN],[
+VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
+ [VULKAN_LIBS="$VULKAN_LIBS -lvulkan"],
+ [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
+ [VULKAN_LIBS="$VULKAN_LIBS -lvulkan-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_cv_lib_soname_MoltenVK"])],
+ [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])],
+ [$VULKAN_LIBS])],
+ [$VULKAN_LIBS])],
+ [$VULKAN_LIBS])
+])
More information about the wine-cvs
mailing list