mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-25 22:35:27 +00:00
Disable Wayland/Mir again for 2.0.3; it's a quick, brown-paper-bag release.
We'll enable it by default for 2.0.4. Hopefully. :) ( http://www.catb.org/jargon/html/B/brown-paper-bag-bug.html )
This commit is contained in:
parent
7a36070a95
commit
b2fcdfca71
|
@ -235,8 +235,8 @@ set_option(RPATH "Use an rpath when linking SDL" ${UNIX_SYS})
|
||||||
set_option(CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" OFF)
|
set_option(CLOCK_GETTIME "Use clock_gettime() instead of gettimeofday()" OFF)
|
||||||
set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS})
|
set_option(INPUT_TSLIB "Use the Touchscreen library for input" ${UNIX_SYS})
|
||||||
set_option(VIDEO_X11 "Use X11 video driver" ${UNIX_SYS})
|
set_option(VIDEO_X11 "Use X11 video driver" ${UNIX_SYS})
|
||||||
set_option(VIDEO_WAYLAND "Use Wayland video driver" ${UNIX_SYS})
|
set_option(VIDEO_WAYLAND "Use Wayland video driver" OFF) #${UNIX_SYS})
|
||||||
set_option(VIDEO_MIR "Use Mir video driver" ${UNIX_SYS})
|
set_option(VIDEO_MIR "Use Mir video driver" OFF) #${UNIX_SYS})
|
||||||
dep_option(X11_SHARED "Dynamically load X11 support" ON "VIDEO_X11" OFF)
|
dep_option(X11_SHARED "Dynamically load X11 support" ON "VIDEO_X11" OFF)
|
||||||
set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
|
set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
|
||||||
foreach(_SUB ${SDL_X11_OPTIONS})
|
foreach(_SUB ${SDL_X11_OPTIONS})
|
||||||
|
|
8
configure
vendored
8
configure
vendored
|
@ -18688,9 +18688,9 @@ CheckWayland()
|
||||||
if test "${enable_video_wayland+set}" = set; then :
|
if test "${enable_video_wayland+set}" = set; then :
|
||||||
enableval=$enable_video_wayland;
|
enableval=$enable_video_wayland;
|
||||||
else
|
else
|
||||||
enable_video_wayland=yes
|
enable_video_wayland=no
|
||||||
fi
|
fi
|
||||||
|
#yes)
|
||||||
|
|
||||||
# Check whether --enable-video-wayland-qt-touch was given.
|
# Check whether --enable-video-wayland-qt-touch was given.
|
||||||
if test "${enable_video_wayland_qt_touch+set}" = set; then :
|
if test "${enable_video_wayland_qt_touch+set}" = set; then :
|
||||||
|
@ -18842,9 +18842,9 @@ CheckMir()
|
||||||
if test "${enable_video_mir+set}" = set; then :
|
if test "${enable_video_mir+set}" = set; then :
|
||||||
enableval=$enable_video_mir;
|
enableval=$enable_video_mir;
|
||||||
else
|
else
|
||||||
enable_video_mir=yes
|
enable_video_mir=no
|
||||||
fi
|
fi
|
||||||
|
#yes)
|
||||||
|
|
||||||
if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
|
if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
|
||||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||||
|
|
|
@ -1164,7 +1164,7 @@ CheckWayland()
|
||||||
{
|
{
|
||||||
AC_ARG_ENABLE(video-wayland,
|
AC_ARG_ENABLE(video-wayland,
|
||||||
AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
|
AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
|
||||||
,enable_video_wayland=yes)
|
,enable_video_wayland=no) #yes)
|
||||||
|
|
||||||
AC_ARG_ENABLE(video-wayland-qt-touch,
|
AC_ARG_ENABLE(video-wayland-qt-touch,
|
||||||
AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for Wayland video driver [[default=yes]]]),
|
AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for Wayland video driver [[default=yes]]]),
|
||||||
|
@ -1246,7 +1246,7 @@ CheckMir()
|
||||||
{
|
{
|
||||||
AC_ARG_ENABLE(video-mir,
|
AC_ARG_ENABLE(video-mir,
|
||||||
AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
|
AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
|
||||||
,enable_video_mir=yes)
|
,enable_video_mir=no) #yes)
|
||||||
|
|
||||||
if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
|
if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
|
||||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||||
|
|
Loading…
Reference in a new issue