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

configure: Allow specifying the Vulkan library path with VULKAN_LIBS.

Browse Source 
Do not define it for the vkd3d build, but restore support for overriding it as a
configure argument.

This partially reverts 99a3adcc19.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52915
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-04-27 11:26:06 -05:00 committed by Alexandre Julliard
parent cf7cf05cb7
commit f34db84c62
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -113,6 +113,7 @@ case $host_os in
esac esac
AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library]) AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library])
AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
AS_IF([test "x$SONAME_LIBVULKAN" = "x"], AS_IF([test "x$SONAME_LIBVULKAN" = "x"],
[VKD3D_CHECK_VULKAN], [VKD3D_CHECK_VULKAN],
[AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])]) [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])])

7
m4/check-vulkan.m4
View File

@ -6,7 +6,8 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],,
[VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
[AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
["$ac_cv_lib_soname_MoltenVK"])], ["$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])
]) ])