Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Enable Wayland and Mir in configure/cmake scripts, now that 2.0.2 has…
- Loading branch information
Showing
with
8 additions
and
8 deletions.
-
+2
−2
CMakeLists.txt
-
+4
−4
configure
-
+2
−2
configure.in
|
@@ -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(INPUT_TSLIB "Use the Touchscreen library for input" ${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_MIR "Use Mir video driver" OFF) #${UNIX_SYS}) |
|
|
set_option(VIDEO_WAYLAND "Use Wayland video driver" ${UNIX_SYS}) |
|
|
set_option(VIDEO_MIR "Use Mir video driver" ${UNIX_SYS}) |
|
|
dep_option(X11_SHARED "Dynamically load X11 support" ON "VIDEO_X11" OFF) |
|
|
set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm) |
|
|
foreach(_SUB ${SDL_X11_OPTIONS}) |
|
|
|
|
|
|
|
if test "${enable_video_wayland+set}" = set; then : |
|
|
enableval=$enable_video_wayland; |
|
|
else |
|
|
enable_video_wayland=no |
|
|
enable_video_wayland=yes |
|
|
fi |
|
|
#yes) |
|
|
|
|
|
|
|
|
# Check whether --enable-video-wayland-qt-touch was given. |
|
|
if test "${enable_video_wayland_qt_touch+set}" = set; then : |
|
|
|
|
if test "${enable_video_mir+set}" = set; then : |
|
|
enableval=$enable_video_mir; |
|
|
else |
|
|
enable_video_mir=no |
|
|
enable_video_mir=yes |
|
|
fi |
|
|
#yes) |
|
|
|
|
|
|
|
|
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. |
|
@@ -1164,7 +1164,7 @@ CheckWayland() |
|
|
{ |
|
|
AC_ARG_ENABLE(video-wayland, |
|
|
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_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_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 |
|
|
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
|
|