eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autotools needs to check d3d12sdklayers.h too

Browse source
This commit is contained in:
Anonymous Maarten 2024-05-28 17:02:26 +02:00
parent 0439fc6007
commit 5e876db89f
2 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
configure vendored
View file

@ -19218,15 +19218,13 @@ then :
ac_cv_func_alloca_works=yes ac_cv_func_alloca_works=yes
else $as_nop else $as_nop
ac_cv_func_alloca_works=no ac_cv_func_alloca_works=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \ rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
fi fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
printf "%s\n" "$ac_cv_func_alloca_works" >&6; } printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
fi
if test $ac_cv_func_alloca_works = yes; then if test $ac_cv_func_alloca_works = yes; then
@ -27600,11 +27598,32 @@ then :
have_d3d11=yes have_d3d11=yes
fi fi
ac_fn_c_check_header_compile "$LINENO" "d3d12.h" "ac_cv_header_d3d12_h" "$ac_includes_default" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for compatible d3d12 headers" >&5
if test "x$ac_cv_header_d3d12_h" = xyes printf %s "checking for compatible d3d12 headers... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <d3d12.h>
#include <d3d12sdklayers.h>
ID3D12Device1 *device;
int
main (void)
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then : then :
have_d3d12=yes have_d3d12=yes
else $as_nop
have_d3d12=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_d3d12" >&5
printf "%s\n" "$have_d3d12" >&6; }
ac_fn_c_check_header_compile "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "$ac_includes_default"
if test "x$ac_cv_header_ddraw_h" = xyes if test "x$ac_cv_header_ddraw_h" = xyes

9
configure.ac
View file

@ -3350,7 +3350,14 @@ CheckDIRECTX()
if test x$enable_directx = xyes; then if test x$enable_directx = xyes; then
AC_CHECK_HEADER(d3d9.h, have_d3d=yes) AC_CHECK_HEADER(d3d9.h, have_d3d=yes)
AC_CHECK_HEADER(d3d11_1.h, have_d3d11=yes) AC_CHECK_HEADER(d3d11_1.h, have_d3d11=yes)
AC_CHECK_HEADER(d3d12.h, have_d3d12=yes) AC_MSG_CHECKING(for compatible d3d12 headers)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <d3d12.h>
#include <d3d12sdklayers.h>
ID3D12Device1 *device;
]])], [have_d3d12=yes],[have_d3d12=no])
AC_MSG_RESULT($have_d3d12)
AC_CHECK_HEADER(ddraw.h, have_ddraw=yes) AC_CHECK_HEADER(ddraw.h, have_ddraw=yes)
AC_CHECK_HEADER(dsound.h, have_dsound=yes) AC_CHECK_HEADER(dsound.h, have_dsound=yes)
AC_CHECK_HEADER(dinput.h, have_dinput=yes) AC_CHECK_HEADER(dinput.h, have_dinput=yes)