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

Enable Wayland and Mir in configure/cmake scripts, now that 2.0.2 has shipped.

This commit is contained in:
Ryan C. Gordon 2014-03-08 15:32:12 -05:00
parent 20dc4214e2
commit 0f1a72c012
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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" OFF) #${UNIX_SYS}) set_option(VIDEO_WAYLAND "Use Wayland video driver" ${UNIX_SYS})
set_option(VIDEO_MIR "Use Mir video driver" OFF) #${UNIX_SYS}) set_option(VIDEO_MIR "Use Mir video driver" ${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
View File

@ -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=no enable_video_wayland=yes
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=no enable_video_mir=yes
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.

4
configure.in
View File

@ -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=no) #yes) ,enable_video_wayland=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=no) #yes) ,enable_video_mir=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)