encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Detect Xrandr >= 1.2 at build time

This commit is contained in:
Gabriel Jacobo 2014-01-30 20:27:13 -03:00
parent 338bf9cc6c
commit 6f3bf18656
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configure vendored
View File

@ -20077,17 +20077,33 @@ else
fi fi
if test x$enable_video_x11_xrandr = xyes; then if test x$enable_video_x11_xrandr = xyes; then
definitely_enable_video_x11_xrandr=no definitely_enable_video_x11_xrandr=no
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "#include <X11/Xlib.h> have_xrandr_h_hdr=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
int
main ()
{
XRRScreenResources *res = NULL;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
have_xrandr_h_hdr=yes
$as_echo "#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1" >>confdefs.h
SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch"
"
if test "x$ac_cv_header_X11_extensions_Xrandr_h" = xyes; then :
have_xrandr_h_hdr=yes
else
have_xrandr_h_hdr=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test x$have_xrandr_h_hdr = xyes; then if test x$have_xrandr_h_hdr = xyes; then
if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
echo "-- dynamic libXrandr -> $xrandr_lib" echo "-- dynamic libXrandr -> $xrandr_lib"

17
configure.in
View File

@ -1508,12 +1508,19 @@ XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f)
AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]), AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11 Xrandr extension for fullscreen [[default=yes]]]),
, enable_video_x11_xrandr=yes) , enable_video_x11_xrandr=yes)
if test x$enable_video_x11_xrandr = xyes; then if test x$enable_video_x11_xrandr = xyes; then
dnl XRRScreenResources is only present in Xrandr >= 1.2, we use that as a test.
definitely_enable_video_x11_xrandr=no definitely_enable_video_x11_xrandr=no
AC_CHECK_HEADER(X11/extensions/Xrandr.h, have_xrandr_h_hdr=no
have_xrandr_h_hdr=yes, AC_TRY_COMPILE([
have_xrandr_h_hdr=no, #include <X11/Xlib.h>
[#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h>
]) ],[
XRRScreenResources *res = NULL;
],[
have_xrandr_h_hdr=yes
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH)
SUMMARY_video_x11="${SUMMARY_video_x11} xinput2_multitouch"
])
if test x$have_xrandr_h_hdr = xyes; then if test x$have_xrandr_h_hdr = xyes; then
if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
echo "-- dynamic libXrandr -> $xrandr_lib" echo "-- dynamic libXrandr -> $xrandr_lib"