mirror of https://github.com/encounter/SDL.git
check for HAVE_ROAPI_H in cmake and autotools, and
update SDL_config_windows.h and SDL_config_winrt.h
This commit is contained in:
parent
575dadb11d
commit
c0bb39e5e9
|
@ -1600,6 +1600,7 @@ elseif(WINDOWS)
|
||||||
|
|
||||||
# headers needed elsewhere
|
# headers needed elsewhere
|
||||||
check_include_file(tpcshrd.h HAVE_TPCSHRD_H)
|
check_include_file(tpcshrd.h HAVE_TPCSHRD_H)
|
||||||
|
check_include_file(roapi.h HAVE_ROAPI_H)
|
||||||
check_include_file(mmdeviceapi.h HAVE_MMDEVICEAPI_H)
|
check_include_file(mmdeviceapi.h HAVE_MMDEVICEAPI_H)
|
||||||
check_include_file(audioclient.h HAVE_AUDIOCLIENT_H)
|
check_include_file(audioclient.h HAVE_AUDIOCLIENT_H)
|
||||||
check_include_file(sensorsapi.h HAVE_SENSORSAPI_H)
|
check_include_file(sensorsapi.h HAVE_SENSORSAPI_H)
|
||||||
|
|
|
@ -24779,6 +24779,30 @@ $as_echo "$have_wince" >&6; }
|
||||||
|
|
||||||
# This fixes Windows stack alignment with newer GCC
|
# This fixes Windows stack alignment with newer GCC
|
||||||
CheckStackBoundary
|
CheckStackBoundary
|
||||||
|
|
||||||
|
# headers needed elsewhere
|
||||||
|
ac_fn_c_check_header_mongrel "$LINENO" "tpcshrd.h" "ac_cv_header_tpcshrd_h" "$ac_includes_default"
|
||||||
|
if test "x$ac_cv_header_tpcshrd_h" = xyes; then :
|
||||||
|
have_tpcshrd_h=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if test x$have_tpcshrd_h = xyes; then
|
||||||
|
|
||||||
|
$as_echo "#define HAVE_TPCSHRD_H 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
|
ac_fn_c_check_header_mongrel "$LINENO" "roapi.h" "ac_cv_header_roapi_h" "$ac_includes_default"
|
||||||
|
if test "x$ac_cv_header_roapi_h" = xyes; then :
|
||||||
|
have_roapi_h=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if test x$have_roapi_h = xyes; then
|
||||||
|
|
||||||
|
$as_echo "#define HAVE_ROAPI_H 1" >>confdefs.h
|
||||||
|
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
CheckOS2()
|
CheckOS2()
|
||||||
|
@ -26255,17 +26279,6 @@ $as_echo "#define SDL_HAPTIC_DINPUT 1" >>confdefs.h
|
||||||
have_haptic=yes
|
have_haptic=yes
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "tpcshrd.h" "ac_cv_header_tpcshrd_h" "$ac_includes_default"
|
|
||||||
if test "x$ac_cv_header_tpcshrd_h" = xyes; then :
|
|
||||||
have_tpcshrd_h=yes
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if test x$have_tpcshrd_h = xyes; then
|
|
||||||
|
|
||||||
$as_echo "#define HAVE_TPCSHRD_H 1" >>confdefs.h
|
|
||||||
|
|
||||||
fi
|
|
||||||
# Set up files for the sensor library
|
# Set up files for the sensor library
|
||||||
ac_fn_c_check_header_mongrel "$LINENO" "sensorsapi.h" "ac_cv_header_sensorsapi_h" "$ac_includes_default"
|
ac_fn_c_check_header_mongrel "$LINENO" "sensorsapi.h" "ac_cv_header_sensorsapi_h" "$ac_includes_default"
|
||||||
if test "x$ac_cv_header_sensorsapi_h" = xyes; then :
|
if test "x$ac_cv_header_sensorsapi_h" = xyes; then :
|
||||||
|
|
14
configure.ac
14
configure.ac
|
@ -3198,6 +3198,16 @@ CheckWINDOWS()
|
||||||
|
|
||||||
# This fixes Windows stack alignment with newer GCC
|
# This fixes Windows stack alignment with newer GCC
|
||||||
CheckStackBoundary
|
CheckStackBoundary
|
||||||
|
|
||||||
|
# headers needed elsewhere
|
||||||
|
AC_CHECK_HEADER(tpcshrd.h,have_tpcshrd_h=yes)
|
||||||
|
if test x$have_tpcshrd_h = xyes; then
|
||||||
|
AC_DEFINE(HAVE_TPCSHRD_H, 1, [ ])
|
||||||
|
fi
|
||||||
|
AC_CHECK_HEADER(roapi.h,have_roapi_h=yes)
|
||||||
|
if test x$have_roapi_h = xyes; then
|
||||||
|
AC_DEFINE(HAVE_ROAPI_H, 1, [ ])
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
dnl Determine whether the compiler can produce OS/2 executables
|
dnl Determine whether the compiler can produce OS/2 executables
|
||||||
|
@ -3999,10 +4009,6 @@ case "$host" in
|
||||||
have_haptic=yes
|
have_haptic=yes
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AC_CHECK_HEADER(tpcshrd.h,have_tpcshrd_h=yes)
|
|
||||||
if test x$have_tpcshrd_h = xyes; then
|
|
||||||
AC_DEFINE(HAVE_TPCSHRD_H, 1, [ ])
|
|
||||||
fi
|
|
||||||
# Set up files for the sensor library
|
# Set up files for the sensor library
|
||||||
AC_CHECK_HEADER(sensorsapi.h,have_winsensors=yes,have_winsensors=no)
|
AC_CHECK_HEADER(sensorsapi.h,have_winsensors=yes,have_winsensors=no)
|
||||||
if test x$have_winsensors = xyes; then
|
if test x$have_winsensors = xyes; then
|
||||||
|
|
|
@ -253,6 +253,7 @@
|
||||||
#cmakedefine HAVE_AUDIOCLIENT_H @HAVE_AUDIOCLIENT_H@
|
#cmakedefine HAVE_AUDIOCLIENT_H @HAVE_AUDIOCLIENT_H@
|
||||||
#cmakedefine HAVE_TPCSHRD_H @HAVE_TPCSHRD_H@
|
#cmakedefine HAVE_TPCSHRD_H @HAVE_TPCSHRD_H@
|
||||||
#cmakedefine HAVE_SENSORSAPI_H @HAVE_SENSORSAPI_H@
|
#cmakedefine HAVE_SENSORSAPI_H @HAVE_SENSORSAPI_H@
|
||||||
|
#cmakedefine HAVE_ROAPI_H @HAVE_ROAPI_H@
|
||||||
|
|
||||||
#cmakedefine HAVE_XINPUT_GAMEPAD_EX @HAVE_XINPUT_GAMEPAD_EX@
|
#cmakedefine HAVE_XINPUT_GAMEPAD_EX @HAVE_XINPUT_GAMEPAD_EX@
|
||||||
#cmakedefine HAVE_XINPUT_STATE_EX @HAVE_XINPUT_STATE_EX@
|
#cmakedefine HAVE_XINPUT_STATE_EX @HAVE_XINPUT_STATE_EX@
|
||||||
|
|
|
@ -242,6 +242,7 @@
|
||||||
#undef HAVE_AUDIOCLIENT_H
|
#undef HAVE_AUDIOCLIENT_H
|
||||||
#undef HAVE_TPCSHRD_H
|
#undef HAVE_TPCSHRD_H
|
||||||
#undef HAVE_SENSORSAPI_H
|
#undef HAVE_SENSORSAPI_H
|
||||||
|
#undef HAVE_ROAPI_H
|
||||||
|
|
||||||
/* SDL internal assertion support */
|
/* SDL internal assertion support */
|
||||||
#undef SDL_DEFAULT_ASSERT_LEVEL
|
#undef SDL_DEFAULT_ASSERT_LEVEL
|
||||||
|
|
|
@ -104,6 +104,7 @@ typedef unsigned int uintptr_t;
|
||||||
#endif
|
#endif
|
||||||
#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0602 /* Windows 8 SDK */
|
#if defined(_WIN32_MAXVER) && _WIN32_MAXVER >= 0x0602 /* Windows 8 SDK */
|
||||||
#define HAVE_D3D11_H 1
|
#define HAVE_D3D11_H 1
|
||||||
|
#define HAVE_ROAPI_H 1
|
||||||
#endif
|
#endif
|
||||||
#define HAVE_MMDEVICEAPI_H 1
|
#define HAVE_MMDEVICEAPI_H 1
|
||||||
#define HAVE_AUDIOCLIENT_H 1
|
#define HAVE_AUDIOCLIENT_H 1
|
||||||
|
|
|
@ -195,6 +195,8 @@ typedef unsigned int uintptr_t;
|
||||||
#define HAVE_TRUNCF 1
|
#define HAVE_TRUNCF 1
|
||||||
#define HAVE__FSEEKI64 1
|
#define HAVE__FSEEKI64 1
|
||||||
|
|
||||||
|
#define HAVE_ROAPI_H 1
|
||||||
|
|
||||||
/* Enable various audio drivers */
|
/* Enable various audio drivers */
|
||||||
#define SDL_AUDIO_DRIVER_WASAPI 1
|
#define SDL_AUDIO_DRIVER_WASAPI 1
|
||||||
#define SDL_AUDIO_DRIVER_DISK 1
|
#define SDL_AUDIO_DRIVER_DISK 1
|
||||||
|
|
Loading…
Reference in New Issue