Refactor meson build files
Use tabs for indentation and break up function calls over 80 col.
This commit is contained in:
Tony Crisci
parent
6daf9e9ab2
commit
368f74e4df
|
|
@ -28,6 +28,9 @@ if systemd.found()
|
|||
backend_files += files('session/logind.c')
|
||||
endif
|
||||
|
||||
lib_wlr_backend = static_library('wlr_backend', backend_files,
|
||||
lib_wlr_backend = static_library(
|
||||
'wlr_backend',
|
||||
backend_files,
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos])
|
||||
dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,14 +1,31 @@
|
|||
lib_shared = static_library('shared',
|
||||
lib_shared = static_library(
|
||||
'shared',
|
||||
['shared.c', 'cat.c', 'ini.c', 'config.c'],
|
||||
dependencies: wlroots)
|
||||
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',
|
||||
executable(
|
||||
'rotation',
|
||||
'rotation.c',
|
||||
dependencies: wlroots,
|
||||
link_with: lib_shared)
|
||||
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,
|
||||
)
|
||||
|
|
|
|||
33
meson.build
33
meson.build
|
|
@ -1,20 +1,30 @@
|
|||
project('wlroots', 'c',
|
||||
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')
|
||||
|
|
@ -74,7 +84,9 @@ wlr_deps = [
|
|||
math,
|
||||
]
|
||||
|
||||
lib_wlr = library('wlroots', files('dummy.c'),
|
||||
lib_wlr = library(
|
||||
'wlroots',
|
||||
files('dummy.c'),
|
||||
link_whole: [
|
||||
lib_wl_protos,
|
||||
lib_wlr_backend,
|
||||
|
|
@ -85,10 +97,13 @@ lib_wlr = library('wlroots', files('dummy.c'),
|
|||
lib_wlr_xwayland,
|
||||
],
|
||||
dependencies: wlr_deps,
|
||||
include_directories: wlr_inc)
|
||||
include_directories: wlr_inc,
|
||||
)
|
||||
|
||||
wlroots = declare_dependency(link_with: lib_wlr,
|
||||
wlroots = declare_dependency(
|
||||
link_with: lib_wlr,
|
||||
dependencies: wlr_deps,
|
||||
include_directories: wlr_inc)
|
||||
include_directories: wlr_inc,
|
||||
)
|
||||
|
||||
subdir('examples')
|
||||
|
|
|
|||
|
|
@ -2,20 +2,26 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
|
|||
|
||||
wayland_scanner = find_program('wayland-scanner')
|
||||
|
||||
wayland_scanner_server = generator(wayland_scanner,
|
||||
wayland_scanner_server = generator(
|
||||
wayland_scanner,
|
||||
output: '@BASENAME@-protocol.h',
|
||||
arguments: ['server-header', '@INPUT@', '@OUTPUT@'])
|
||||
arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
|
||||
)
|
||||
|
||||
wayland_scanner_code = generator(wayland_scanner,
|
||||
wayland_scanner_code = generator(
|
||||
wayland_scanner,
|
||||
output: '@BASENAME@-protocol.c',
|
||||
arguments: ['code', '@INPUT@', '@OUTPUT@'])
|
||||
arguments: ['code', '@INPUT@', '@OUTPUT@'],
|
||||
)
|
||||
|
||||
wayland_scanner_client = generator(wayland_scanner,
|
||||
wayland_scanner_client = generator(
|
||||
wayland_scanner,
|
||||
output: '@BASENAME@-client-protocol.h',
|
||||
arguments: ['client-header', '@INPUT@', '@OUTPUT@'])
|
||||
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 = [
|
||||
|
|
@ -37,6 +43,8 @@ foreach p : client_protocols
|
|||
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)
|
||||
sources: wl_protos_headers,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
lib_wlr_render = static_library('wlr_render', files(
|
||||
lib_wlr_render = static_library(
|
||||
'wlr_render',
|
||||
files(
|
||||
'egl.c',
|
||||
'matrix.c',
|
||||
'gles2/pixel_format.c',
|
||||
|
|
@ -10,4 +12,5 @@ lib_wlr_render = static_library('wlr_render', files(
|
|||
'wlr_texture.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [glesv2, egl])
|
||||
dependencies: [glesv2, egl],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
lib_wlr_types = static_library('wlr_types', files(
|
||||
lib_wlr_types = static_library(
|
||||
'wlr_types',
|
||||
files(
|
||||
'wlr_data_device_manager.c',
|
||||
'wlr_data_source.c',
|
||||
'wlr_input_device.c',
|
||||
|
|
@ -19,4 +21,5 @@ lib_wlr_types = static_library('wlr_types', files(
|
|||
'wlr_box.c',
|
||||
),
|
||||
include_directories: wlr_inc,
|
||||
dependencies: [wayland_server, pixman, wlr_protos])
|
||||
dependencies: [wayland_server, pixman, wlr_protos],
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
lib_wlr_util = static_library('wlr_util', files(
|
||||
lib_wlr_util = static_library(
|
||||
'wlr_util',
|
||||
files(
|
||||
'list.c',
|
||||
'log.c',
|
||||
),
|
||||
include_directories: wlr_inc)
|
||||
include_directories: wlr_inc,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
lib_wlr_xcursor = static_library('wlr_xcursor', files(
|
||||
lib_wlr_xcursor = static_library(
|
||||
'wlr_xcursor',
|
||||
files(
|
||||
'xcursor.c',
|
||||
'wlr_xcursor.c',
|
||||
),
|
||||
include_directories: wlr_inc)
|
||||
include_directories: wlr_inc,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
lib_wlr_xwayland = static_library('wlr_xwayland', files(
|
||||
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])
|
||||
dependencies: [wayland_server, xcb, xcb_composite, pixman],
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue