diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-26 23:20:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 23:20:46 -0400 |
| commit | b1c4f01bad11fec82c45b48db7739d621f2d58a9 (patch) | |
| tree | ab63b01be07cebed0e2b18e2e556cfb81246476f /backend | |
| parent | 62e9ab0c4558f67ac9bcaa2bd0a6a76a7bbe130c (diff) | |
| parent | 706f77e3c735e49b4a051d545f40043a53e1ea2c (diff) | |
Merge pull request #713 from ManDay/master
Make X11 fully optional
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/backend.c | 4 | ||||
| -rw-r--r-- | backend/meson.build | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/backend/backend.c b/backend/backend.c index c67be617..02b0b9af 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -11,7 +11,9 @@ #include <wlr/backend/multi.h> #include <wlr/backend/session.h> #include <wlr/backend/wayland.h> +#ifdef WLR_HAS_X11_BACKEND #include <wlr/backend/x11.h> +#endif #include <wlr/util/log.h> void wlr_backend_init(struct wlr_backend *backend, @@ -94,6 +96,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { } } +#ifdef WLR_HAS_X11_BACKEND const char *x11_display = getenv("DISPLAY"); if (x11_display) { struct wlr_backend *x11_backend = @@ -101,6 +104,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { wlr_multi_backend_add(backend, x11_backend); return backend; } +#endif // Attempt DRM+libinput struct wlr_session *session = wlr_session_create(display); diff --git a/backend/meson.build b/backend/meson.build index c0ed76f1..a74ea024 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -24,7 +24,6 @@ backend_files = files( 'wayland/output.c', 'wayland/registry.c', 'wayland/wl_seat.c', - 'x11/backend.c', ) backend_deps = [ @@ -50,6 +49,10 @@ if conf_data.get('WLR_HAS_SYSTEMD', false) backend_deps += systemd endif +if conf_data.get('WLR_HAS_X11_BACKEND', false) + backend_files += files('x11/backend.c') +endif + if conf_data.get('WLR_HAS_ELOGIND', false) backend_files += files('session/logind.c') backend_deps += elogind |