mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-26 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make xwayland compile-time optional

Browse source
This commit is contained in:
Versus Void 2017-10-06 21:50:25 +00:00
parent decd87043f
commit 9cab66f0f9
7 changed files with 57 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rootston/desktop.c
View file

@ -159,6 +159,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
&desktop->wl_shell_surface);
desktop->wl_shell_surface.notify = handle_wl_shell_surface;
#ifdef HAS_XWAYLAND
if (config->xwayland) {
desktop->xwayland = wlr_xwayland_create(server->wl_display,
desktop->compositor);
@ -166,6 +167,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
&desktop->xwayland_surface);
desktop->xwayland_surface.notify = handle_xwayland_surface;
}
#endif
desktop->gamma_control_manager = wlr_gamma_control_manager_create(
server->wl_display);

33
rootston/meson.build
View file

@ -1,17 +1,20 @@
sources = [
'config.c',
'cursor.c',
'desktop.c',
'ini.c',
'input.c',
'keyboard.c',
'main.c',
'output.c',
'pointer.c',
'tablet_tool.c',
'xdg_shell_v6.c',
'wl_shell.c',
]
if get_option('enable_xwayland')
sources += ['xwayland.c']
endif
executable(
'rootston', [
'config.c',
'cursor.c',
'desktop.c',
'ini.c',
'input.c',
'keyboard.c',
'main.c',
'output.c',
'pointer.c',
'tablet_tool.c',
'xdg_shell_v6.c',
'xwayland.c',
'wl_shell.c',
], dependencies: wlroots
'rootston', sources, dependencies: wlroots
)