Module: wine Branch: master Commit: 72cf4a99c6a0215d6bb18d274779aa99b2c67bc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72cf4a99c6a0215d6bb18d274...
Author: Józef Kucia jkucia@codeweavers.com Date: Thu Mar 14 13:13:26 2019 +0100
configure: Require libvkd3d 1.1.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46835 Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/configure b/configure index 5a091db..4597eae 100755 --- a/configure +++ b/configure @@ -15600,11 +15600,11 @@ LIBS="-lvkd3d $VKD3D_LIBS $LIBS" #ifdef __cplusplus extern "C" #endif -char vkd3d_create_device (); +char vkd3d_get_dxgi_format (); int main () { -return vkd3d_create_device (); +return vkd3d_get_dxgi_format (); ; return 0; } @@ -15644,9 +15644,9 @@ test -z "$VKD3D_LIBS" || VKD3D_LIBS=`echo " $VKD3D_LIBS" | sed 's/ -L([^/])/ - fi if test "x$ac_cv_lib_soname_vkd3d" = "x"; then : case "x$with_vkd3d" in - x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported." ;; + x) as_fn_append wine_notices "|vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported." ;; xno) ;; - *) as_fn_error $? "vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported. + *) as_fn_error $? "vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported. This is an error since --with-vkd3d was requested." "$LINENO" 5 ;; esac
diff --git a/configure.ac b/configure.ac index 87d8bf5..744bf61 100644 --- a/configure.ac +++ b/configure.ac @@ -1873,10 +1873,10 @@ dnl **** Check for vkd3d **** if test "x$with_vkd3d" != "xno" then WINE_PACKAGE_FLAGS(VKD3D,[libvkd3d],,,, - [WINE_CHECK_SONAME(vkd3d,vkd3d_create_device,,,[$VKD3D_LIBS])]) + [WINE_CHECK_SONAME(vkd3d,vkd3d_get_dxgi_format,,,[$VKD3D_LIBS])]) fi WINE_NOTICE_WITH(vkd3d,[test "x$ac_cv_lib_soname_vkd3d" = "x"], - [vkd3d ${notice_platform}development files not found, Direct3D 12 won't be supported.]) + [vkd3d ${notice_platform}development files not found (or too old), Direct3D 12 won't be supported.]) test "x$ac_cv_lib_soname_vkd3d" != "x" || enable_d3d12=${enable_d3d12:-no}
dnl **** Check for gcc specific options ****