Commit dbbb4480 authored by Sam Lantinga's avatar Sam Lantinga

Added --disable-dga configure option to disable DGA entirely

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4017
parent 8de23bec
...@@ -347,7 +347,7 @@ dnl See if the NAS audio interface is supported ...@@ -347,7 +347,7 @@ dnl See if the NAS audio interface is supported
CheckNAS() CheckNAS()
{ {
AC_ARG_ENABLE(nas, AC_ARG_ENABLE(nas,
[ --enable-nas support the NAS audio API [default=yes]], [ --enable-nas support the NAS audio API [default=yes]],
, enable_nas=yes) , enable_nas=yes)
if test x$enable_audio = xyes -a x$enable_nas = xyes; then if test x$enable_audio = xyes -a x$enable_nas = xyes; then
AC_MSG_CHECKING(for NAS audio support) AC_MSG_CHECKING(for NAS audio support)
...@@ -474,25 +474,30 @@ CheckX11() ...@@ -474,25 +474,30 @@ CheckX11()
fi fi
fi fi
fi fi
AC_ARG_ENABLE(dga,
[ --enable-dga allow use of X11 DGA code [default=yes]],
, enable_dga=yes)
AC_ARG_ENABLE(video-x11-dgamouse, AC_ARG_ENABLE(video-x11-dgamouse,
[ --enable-video-x11-dgamouse use X11 DGA for mouse events [default=yes]], [ --enable-video-x11-dgamouse use X11 DGA for mouse events [default=yes]],
, enable_video_x11_dgamouse=yes) , enable_video_x11_dgamouse=yes)
AC_MSG_CHECKING(for XFree86 DGA 1.0 support) if test x$enable_dga = xyes; then
video_x11_dga=no AC_MSG_CHECKING(for XFree86 DGA 1.0 support)
AC_TRY_COMPILE([ video_x11_dga=no
#include <X11/Xlib.h> AC_TRY_COMPILE([
#include <X11/extensions/xf86dga.h> #include <X11/Xlib.h>
],[ #include <X11/extensions/xf86dga.h>
],[ ],[
video_x11_dga=yes ],[
]) video_x11_dga=yes
AC_MSG_RESULT($video_x11_dga) ])
if test x$video_x11_dga = xyes; then AC_MSG_RESULT($video_x11_dga)
CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE" if test x$video_x11_dga = xyes; then
if test x$enable_video_x11_dgamouse = xyes; then CFLAGS="$CFLAGS -DXFREE86_DGAMOUSE"
CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE" if test x$enable_video_x11_dgamouse = xyes; then
CFLAGS="$CFLAGS -DDEFAULT_DGAMOUSE"
fi
SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86dga"
fi fi
SYSTEM_LIBS="$SYSTEM_LIBS -lXxf86dga"
fi fi
AC_ARG_ENABLE(video-x11-xv, AC_ARG_ENABLE(video-x11-xv,
[ --enable-video-x11-xv use X11 XvImage extension for video [default=yes]], [ --enable-video-x11-xv use X11 XvImage extension for video [default=yes]],
...@@ -687,7 +692,7 @@ dnl rcg04172001 Set up the Null video driver. ...@@ -687,7 +692,7 @@ dnl rcg04172001 Set up the Null video driver.
CheckDummyVideo() CheckDummyVideo()
{ {
AC_ARG_ENABLE(video-dummy, AC_ARG_ENABLE(video-dummy,
[ --enable-video-dummy use dummy video driver [default=no]], [ --enable-video-dummy use dummy video driver [default=no]],
, enable_video_dummy=no) , enable_video_dummy=no)
if test x$enable_video_dummy = xyes; then if test x$enable_video_dummy = xyes; then
CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO" CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"
......
...@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>. ...@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
Major changes since SDL 1.0.0: Major changes since SDL 1.0.0:
</H2> </H2>
<UL> <UL>
<LI> 1.2.1: Added --disable-dga configure option to disable DGA entirely
<LI> 1.2.1: Fixed stuck keys when changing the video mode <LI> 1.2.1: Fixed stuck keys when changing the video mode
<LI> 1.2.1: Fixed double-mouse event bug on Windows using OpenGL <LI> 1.2.1: Fixed double-mouse event bug on Windows using OpenGL
<LI> 1.2.1: Fixed 320x200 video mode on framebuffer console <LI> 1.2.1: Fixed 320x200 video mode on framebuffer console
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment