aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backend/meson.build57
-rw-r--r--examples/meson.build33
-rw-r--r--meson.build107
-rw-r--r--protocol/meson.build48
-rw-r--r--render/meson.build29
-rw-r--r--types/meson.build47
-rw-r--r--util/meson.build13
-rw-r--r--xcursor/meson.build13
-rw-r--r--xwayland/meson.build17
9 files changed, 211 insertions, 153 deletions
diff --git a/backend/meson.build b/backend/meson.build
index fcff55b6..eb8c5d8b 100644
--- a/backend/meson.build
+++ b/backend/meson.build
@@ -1,33 +1,36 @@
backend_files = files(
- 'backend.c',
- 'session/direct-ipc.c',
- 'session/direct.c',
- 'session/session.c',
- 'drm/backend.c',
- 'drm/drm.c',
- 'drm/drm-atomic.c',
- 'drm/drm-legacy.c',
- 'drm/drm-properties.c',
- 'drm/drm-util.c',
- 'libinput/backend.c',
- 'libinput/events.c',
- 'libinput/keyboard.c',
- 'libinput/pointer.c',
- 'libinput/tablet_pad.c',
- 'libinput/tablet_tool.c',
- 'libinput/touch.c',
- 'multi/backend.c',
- 'wayland/backend.c',
- 'wayland/output.c',
- 'wayland/registry.c',
- 'wayland/wl_seat.c',
- 'wayland/os-compatibility.c',
+ 'backend.c',
+ 'session/direct-ipc.c',
+ 'session/direct.c',
+ 'session/session.c',
+ 'drm/backend.c',
+ 'drm/drm.c',
+ 'drm/drm-atomic.c',
+ 'drm/drm-legacy.c',
+ 'drm/drm-properties.c',
+ 'drm/drm-util.c',
+ 'libinput/backend.c',
+ 'libinput/events.c',
+ 'libinput/keyboard.c',
+ 'libinput/pointer.c',
+ 'libinput/tablet_pad.c',
+ 'libinput/tablet_tool.c',
+ 'libinput/touch.c',
+ 'multi/backend.c',
+ 'wayland/backend.c',
+ 'wayland/output.c',
+ 'wayland/registry.c',
+ 'wayland/wl_seat.c',
+ 'wayland/os-compatibility.c',
)
if systemd.found()
- backend_files += files('session/logind.c')
+ backend_files += files('session/logind.c')
endif
-lib_wlr_backend = static_library('wlr_backend', backend_files,
- include_directories: wlr_inc,
- dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos])
+lib_wlr_backend = static_library(
+ 'wlr_backend',
+ backend_files,
+ include_directories: wlr_inc,
+ dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos],
+)
diff --git a/examples/meson.build b/examples/meson.build
index 8fda974f..5d3ff52a 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,14 +1,31 @@
-lib_shared = static_library('shared',
- ['shared.c', 'cat.c', 'ini.c', 'config.c'],
- dependencies: wlroots)
+lib_shared = static_library(
+ 'shared',
+ ['shared.c', 'cat.c', 'ini.c', 'config.c'],
+ dependencies: wlroots,
+)
executable('simple', 'simple.c', dependencies: wlroots, link_with: lib_shared)
-executable('rotation', 'rotation.c', dependencies: wlroots, link_with: lib_shared)
executable('pointer', 'pointer.c', dependencies: wlroots, link_with: lib_shared)
executable('touch', 'touch.c', dependencies: wlroots, link_with: lib_shared)
executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared)
-executable('output-layout', 'output-layout.c', dependencies: wlroots, link_with: lib_shared)
-executable('compositor', 'compositor.c',
- dependencies: wlroots,
- link_with: lib_shared)
+executable(
+ 'rotation',
+ 'rotation.c',
+ dependencies: wlroots,
+ link_with: lib_shared,
+)
+
+executable(
+ 'output-layout',
+ 'output-layout.c',
+ dependencies: wlroots,
+ link_with: lib_shared,
+)
+
+executable(
+ 'compositor',
+ 'compositor.c',
+ dependencies: wlroots,
+ link_with: lib_shared,
+)
diff --git a/meson.build b/meson.build
index 9a9574fd..ceded2d1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,23 +1,33 @@
-project('wlroots', 'c',
- license: 'MIT',
- default_options: [
- 'c_std=c11',
- 'warning_level=2',
- 'werror=true',
- ])
+project(
+ 'wlroots',
+ 'c',
+ license: 'MIT',
+ default_options: [
+ 'c_std=c11',
+ 'warning_level=2',
+ 'werror=true',
+ ],
+)
add_project_arguments('-Wno-unused-parameter', language: 'c')
-add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c')
-add_project_link_arguments('-Wl,-rpath,@0@'.format(meson.build_root()), language: 'c')
+add_project_arguments(
+ '-DWLR_SRC_DIR="@0@"'.format(meson.source_root()),
+ language: 'c',
+)
+add_project_link_arguments(
+ '-Wl,-rpath,@0@'.format(meson.build_root()),
+ language: 'c',
+)
wlr_inc = include_directories('include')
cc = meson.get_compiler('c')
-# Clang complains about some zeroed initialiser lists (= {0}), even though they are valid
+# Clang complains about some zeroed initialiser lists (= {0}), even though they
+# are valid
if cc.get_id() == 'clang'
- add_project_arguments('-Wno-missing-field-initializers', language: 'c')
- add_project_arguments('-Wno-missing-braces', language: 'c')
+ add_project_arguments('-Wno-missing-field-initializers', language: 'c')
+ add_project_arguments('-Wno-missing-braces', language: 'c')
endif
wayland_server = dependency('wayland-server')
@@ -39,11 +49,11 @@ systemd = dependency('libsystemd', required: false)
math = cc.find_library('m', required: false)
if libcap.found() and get_option('enable_libcap')
- add_project_arguments('-DHAS_LIBCAP', language: 'c')
+ add_project_arguments('-DHAS_LIBCAP', language: 'c')
endif
if systemd.found() and get_option('enable_systemd')
- add_project_arguments('-DHAS_SYSTEMD', language: 'c')
+ add_project_arguments('-DHAS_SYSTEMD', language: 'c')
endif
subdir('protocol')
@@ -55,40 +65,45 @@ subdir('xcursor')
subdir('xwayland')
wlr_deps = [
- wayland_server,
- wayland_client,
- wayland_egl,
- wayland_protos,
- egl,
- glesv2,
- drm,
- gbm,
- libinput,
- xkbcommon,
- udev,
- pixman,
- xcb,
- xcb_composite,
- libcap,
- systemd,
- math,
+ wayland_server,
+ wayland_client,
+ wayland_egl,
+ wayland_protos,
+ egl,
+ glesv2,
+ drm,
+ gbm,
+ libinput,
+ xkbcommon,
+ udev,
+ pixman,
+ xcb,
+ xcb_composite,
+ libcap,
+ systemd,
+ math,
]
-lib_wlr = library('wlroots', files('dummy.c'),
- link_whole: [
- lib_wl_protos,
- lib_wlr_backend,
- lib_wlr_render,
- lib_wlr_types,
- lib_wlr_util,
- lib_wlr_xcursor,
- lib_wlr_xwayland,
- ],
- dependencies: wlr_deps,
- include_directories: wlr_inc)
+lib_wlr = library(
+ 'wlroots',
+ files('dummy.c'),
+ link_whole: [
+ lib_wl_protos,
+ lib_wlr_backend,
+ lib_wlr_render,
+ lib_wlr_types,
+ lib_wlr_util,
+ lib_wlr_xcursor,
+ lib_wlr_xwayland,
+ ],
+ dependencies: wlr_deps,
+ include_directories: wlr_inc,
+)
-wlroots = declare_dependency(link_with: lib_wlr,
- dependencies: wlr_deps,
- include_directories: wlr_inc)
+wlroots = declare_dependency(
+ link_with: lib_wlr,
+ dependencies: wlr_deps,
+ include_directories: wlr_inc,
+)
subdir('examples')
diff --git a/protocol/meson.build b/protocol/meson.build
index f338e199..78bc14b5 100644
--- a/protocol/meson.build
+++ b/protocol/meson.build
@@ -2,41 +2,49 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner')
-wayland_scanner_server = generator(wayland_scanner,
- output: '@BASENAME@-protocol.h',
- arguments: ['server-header', '@INPUT@', '@OUTPUT@'])
-
-wayland_scanner_code = generator(wayland_scanner,
- output: '@BASENAME@-protocol.c',
- arguments: ['code', '@INPUT@', '@OUTPUT@'])
-
-wayland_scanner_client = generator(wayland_scanner,
- output: '@BASENAME@-client-protocol.h',
- arguments: ['client-header', '@INPUT@', '@OUTPUT@'])
+wayland_scanner_server = generator(
+ wayland_scanner,
+ output: '@BASENAME@-protocol.h',
+ arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
+)
+
+wayland_scanner_code = generator(
+ wayland_scanner,
+ output: '@BASENAME@-protocol.c',
+ arguments: ['code', '@INPUT@', '@OUTPUT@'],
+)
+
+wayland_scanner_client = generator(
+ wayland_scanner,
+ output: '@BASENAME@-client-protocol.h',
+ arguments: ['client-header', '@INPUT@', '@OUTPUT@'],
+)
protocols = [
- [ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ]
+ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
]
client_protocols = [
- [ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ]
+ [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml']
]
wl_protos_src = []
wl_protos_headers = []
foreach p : protocols
- xml = join_paths(p)
- wl_protos_src += wayland_scanner_code.process(xml)
- wl_protos_headers += wayland_scanner_server.process(xml)
+ xml = join_paths(p)
+ wl_protos_src += wayland_scanner_code.process(xml)
+ wl_protos_headers += wayland_scanner_server.process(xml)
endforeach
foreach p : client_protocols
- xml = join_paths(p)
- wl_protos_headers += wayland_scanner_client.process(xml)
+ xml = join_paths(p)
+ wl_protos_headers += wayland_scanner_client.process(xml)
endforeach
lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers)
+
wlr_protos = declare_dependency(
- link_with: lib_wl_protos,
- sources: wl_protos_headers)
+ link_with: lib_wl_protos,
+ sources: wl_protos_headers,
+)
diff --git a/render/meson.build b/render/meson.build
index 02bbd857..dc0ceeb9 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -1,13 +1,16 @@
-lib_wlr_render = static_library('wlr_render', files(
- 'egl.c',
- 'matrix.c',
- 'gles2/pixel_format.c',
- 'gles2/renderer.c',
- 'gles2/shaders.c',
- 'gles2/texture.c',
- 'gles2/util.c',
- 'wlr_renderer.c',
- 'wlr_texture.c',
- ),
- include_directories: wlr_inc,
- dependencies: [glesv2, egl])
+lib_wlr_render = static_library(
+ 'wlr_render',
+ files(
+ 'egl.c',
+ 'matrix.c',
+ 'gles2/pixel_format.c',
+ 'gles2/renderer.c',
+ 'gles2/shaders.c',
+ 'gles2/texture.c',
+ 'gles2/util.c',
+ 'wlr_renderer.c',
+ 'wlr_texture.c',
+ ),
+ include_directories: wlr_inc,
+ dependencies: [glesv2, egl],
+)
diff --git a/types/meson.build b/types/meson.build
index 56390475..697e2f4c 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -1,22 +1,25 @@
-lib_wlr_types = static_library('wlr_types', files(
- 'wlr_data_device_manager.c',
- 'wlr_data_source.c',
- 'wlr_input_device.c',
- 'wlr_keyboard.c',
- 'wlr_output.c',
- 'wlr_output_layout.c',
- 'wlr_pointer.c',
- 'wlr_cursor.c',
- 'wlr_region.c',
- 'wlr_seat.c',
- 'wlr_surface.c',
- 'wlr_tablet_pad.c',
- 'wlr_tablet_tool.c',
- 'wlr_touch.c',
- 'wlr_xdg_shell_v6.c',
- 'wlr_wl_shell.c',
- 'wlr_compositor.c',
- 'wlr_box.c',
- ),
- include_directories: wlr_inc,
- dependencies: [wayland_server, pixman, wlr_protos])
+lib_wlr_types = static_library(
+ 'wlr_types',
+ files(
+ 'wlr_data_device_manager.c',
+ 'wlr_data_source.c',
+ 'wlr_input_device.c',
+ 'wlr_keyboard.c',
+ 'wlr_output.c',
+ 'wlr_output_layout.c',
+ 'wlr_pointer.c',
+ 'wlr_cursor.c',
+ 'wlr_region.c',
+ 'wlr_seat.c',
+ 'wlr_surface.c',
+ 'wlr_tablet_pad.c',
+ 'wlr_tablet_tool.c',
+ 'wlr_touch.c',
+ 'wlr_xdg_shell_v6.c',
+ 'wlr_wl_shell.c',
+ 'wlr_compositor.c',
+ 'wlr_box.c',
+ ),
+ include_directories: wlr_inc,
+ dependencies: [wayland_server, pixman, wlr_protos],
+)
diff --git a/util/meson.build b/util/meson.build
index 7d0d3864..a612325f 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -1,5 +1,8 @@
-lib_wlr_util = static_library('wlr_util', files(
- 'list.c',
- 'log.c',
- ),
- include_directories: wlr_inc)
+lib_wlr_util = static_library(
+ 'wlr_util',
+ files(
+ 'list.c',
+ 'log.c',
+ ),
+ include_directories: wlr_inc,
+)
diff --git a/xcursor/meson.build b/xcursor/meson.build
index 712da35a..e8d456cb 100644
--- a/xcursor/meson.build
+++ b/xcursor/meson.build
@@ -1,5 +1,8 @@
-lib_wlr_xcursor = static_library('wlr_xcursor', files(
- 'xcursor.c',
- 'wlr_xcursor.c',
- ),
- include_directories: wlr_inc)
+lib_wlr_xcursor = static_library(
+ 'wlr_xcursor',
+ files(
+ 'xcursor.c',
+ 'wlr_xcursor.c',
+ ),
+ include_directories: wlr_inc,
+)
diff --git a/xwayland/meson.build b/xwayland/meson.build
index dbad27bb..9797a1a1 100644
--- a/xwayland/meson.build
+++ b/xwayland/meson.build
@@ -1,7 +1,10 @@
-lib_wlr_xwayland = static_library('wlr_xwayland', files(
- 'sockets.c',
- 'xwayland.c',
- 'xwm.c',
- ),
- include_directories: wlr_inc,
- dependencies: [wayland_server, xcb, xcb_composite, pixman])
+lib_wlr_xwayland = static_library(
+ 'wlr_xwayland',
+ files(
+ 'sockets.c',
+ 'xwayland.c',
+ 'xwm.c',
+ ),
+ include_directories: wlr_inc,
+ dependencies: [wayland_server, xcb, xcb_composite, pixman],
+)
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-27 01:29:08 +0000