marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
stable
Józef Kucia 2019-03-14 13:13:26 +01:00 committed by Alexandre Julliard
parent 0f86a47ece
commit 72cf4a99c6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

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

4
configure.ac
View File

@ -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 ****