diff options
author | Reza Jelveh <[email protected]> | 2024-04-15 13:39:41 +0800 |
---|---|---|
committer | GitHub <[email protected]> | 2024-04-15 01:39:41 -0400 |
commit | fb86ed6b0588dfdebfb66ce875bc63cfa0a897f6 (patch) | |
tree | 29857a1769107adc58696f08d379f608aa4e29a2 /sway/meson.build | |
parent | a5e79676c4bd22fc5902182acf0667907202a465 (diff) |
feat: 1.9 merge (#277)
Co-authored-by: William McKinnon <[email protected]>
Co-authored-by: Erik Reider <[email protected]>
Diffstat (limited to 'sway/meson.build')
-rw-r--r-- | sway/meson.build | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sway/meson.build b/sway/meson.build index f0f26346..40c7382e 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -15,11 +15,6 @@ sway_sources = files( 'xdg_decoration.c', 'desktop/desktop.c', - 'desktop/fx_renderer/fx_framebuffer.c', - 'desktop/fx_renderer/fx_renderer.c', - 'desktop/fx_renderer/fx_stencilbuffer.c', - 'desktop/fx_renderer/fx_texture.c', - 'desktop/fx_renderer/matrix.c', 'desktop/idle_inhibit_v1.c', 'desktop/layer_shell.c', 'desktop/output.c', @@ -32,7 +27,6 @@ sway_sources = files( 'input/input-manager.c', 'input/cursor.c', 'input/keyboard.c', - 'input/libinput.c', 'input/seat.c', 'input/seatop_default.c', 'input/seatop_down.c', @@ -107,6 +101,7 @@ sway_sources = files( 'commands/nop.c', 'commands/output.c', 'commands/popup_during_fullscreen.c', + 'commands/primary_selection.c', 'commands/reload.c', 'commands/rename.c', 'commands/resize.c', @@ -196,9 +191,11 @@ sway_sources = files( 'commands/input/middle_emulation.c', 'commands/input/natural_scroll.c', 'commands/input/pointer_accel.c', + 'commands/input/rotation_angle.c', 'commands/input/repeat_delay.c', 'commands/input/repeat_rate.c', 'commands/input/scroll_button.c', + 'commands/input/scroll_button_lock.c', 'commands/input/scroll_factor.c', 'commands/input/scroll_method.c', 'commands/input/tap.c', @@ -240,8 +237,6 @@ sway_sources = files( 'tree/output.c', ) -subdir('desktop/fx_renderer/shaders') - sway_deps = [ cairo, drm, @@ -252,19 +247,23 @@ sway_deps = [ math, pango, pcre2, - glesv2, pixman, + scenefx, threads, wayland_server, wlroots, xkbcommon, + xcb, xcb_icccm, egl, ] if have_xwayland sway_sources += 'desktop/xwayland.c' - sway_deps += xcb +endif + +if wlroots_features['libinput_backend'] + sway_sources += 'input/libinput.c' endif executable( |