wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

build: Move Vulkan library detection to m4/check-vulkan.m4.

Browse Source 
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:39 +01:00 committed by Alexandre Julliard
parent 8c01e98650
commit 0e504e974a
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -106,19 +106,7 @@ AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
VKD3D_CHECK_PTHREAD VKD3D_CHECK_PTHREAD
AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library]) AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], VKD3D_CHECK_VULKAN
[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])
AS_IF([test "x$with_ncurses" != "xno"], AS_IF([test "x$with_ncurses" != "xno"],
[PKG_CHECK_MODULES([NCURSES], [ncurses], [PKG_CHECK_MODULES([NCURSES], [ncurses],

16
m4/check-vulkan.m4 Normal file
View File

@ -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])
])