hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 12:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #64

Browse source
This commit is contained in:
Drew DeVault 2017-08-13 08:26:32 -04:00
parent e6a7817e45
commit d4b4bfb8bc
7 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/meson.build
View file

@ -1,6 +1,6 @@
lib_shared = static_library('shared', lib_shared = static_library('shared',
['shared.c', 'cat.c'], ['shared.c', 'cat.c'],
dependencies: wlroots) dependencies: wlroots)
executable('simple', 'simple.c', dependencies: wlroots, link_with: lib_shared) executable('simple', 'simple.c', dependencies: wlroots, link_with: lib_shared)
executable('rotation', 'rotation.c', dependencies: wlroots, link_with: lib_shared) executable('rotation', 'rotation.c', dependencies: wlroots, link_with: lib_shared)
@ -9,11 +9,11 @@ executable('touch', 'touch.c', dependencies: wlroots, link_with: lib_shared)
executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared) executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared)
compositor_src = [ compositor_src = [
'compositor/main.c', 'compositor/main.c',
'compositor/wl_compositor.c', 'compositor/wl_compositor.c',
'compositor/wl_shell.c', 'compositor/wl_shell.c',
] ]
executable('compositor', compositor_src, executable('compositor', compositor_src,
dependencies: wlroots, dependencies: wlroots,
link_with: lib_shared) link_with: lib_shared)

90
meson.build
View file

@ -1,6 +1,6 @@
project('wlroots', 'c', project('wlroots', 'c',
license: 'MIT', license: 'MIT',
default_options: 'c_std=c11') default_options: 'c_std=c11')
add_project_arguments('-Wall', '-Wextra', '-Wno-unused-parameter', '-Werror', language: 'c') add_project_arguments('-Wall', '-Wextra', '-Wno-unused-parameter', '-Werror', language: 'c')
add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c') add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c')
@ -15,32 +15,32 @@ 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' if cc.get_id() == 'clang'
add_project_arguments('-Wno-missing-field-initializers', language: 'c') add_project_arguments('-Wno-missing-field-initializers', language: 'c')
add_project_arguments('-Wno-missing-braces', language: 'c') add_project_arguments('-Wno-missing-braces', language: 'c')
endif endif
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
wayland_client = dependency('wayland-client') wayland_client = dependency('wayland-client')
wayland_egl = dependency('wayland-egl') wayland_egl = dependency('wayland-egl')
wayland_protos = dependency('wayland-protocols') wayland_protos = dependency('wayland-protocols')
egl = dependency('egl') egl = dependency('egl')
glesv2 = dependency('glesv2') glesv2 = dependency('glesv2')
drm = dependency('libdrm') drm = dependency('libdrm')
gbm = dependency('gbm') gbm = dependency('gbm')
libinput = dependency('libinput') libinput = dependency('libinput')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')
udev = dependency('libudev') udev = dependency('libudev')
pixman = dependency('pixman-1') pixman = dependency('pixman-1')
libcap = dependency('libcap', required: false) libcap = dependency('libcap', required: false)
systemd = dependency('libsystemd', required: false) systemd = dependency('libsystemd', required: false)
math = cc.find_library('m', required: false) math = cc.find_library('m', required: false)
if libcap.found() if libcap.found()
add_project_arguments('-DHAS_LIBCAP', language: 'c') add_project_arguments('-DHAS_LIBCAP', language: 'c')
endif endif
if systemd.found() if systemd.found()
add_project_arguments('-DHAS_SYSTEMD', language: 'c') add_project_arguments('-DHAS_SYSTEMD', language: 'c')
endif endif
subdir('protocol') subdir('protocol')
@ -51,37 +51,37 @@ subdir('util')
subdir('xcursor') subdir('xcursor')
_wlr_deps = [ _wlr_deps = [
wayland_server, wayland_server,
wayland_client, wayland_client,
wayland_egl, wayland_egl,
wayland_protos, wayland_protos,
egl, egl,
glesv2, glesv2,
drm, drm,
gbm, gbm,
libinput, libinput,
xkbcommon, xkbcommon,
udev, udev,
pixman, pixman,
libcap, libcap,
systemd, systemd,
math, math,
] ]
lib_wlr = library('wlroots', files('dummy.c'), lib_wlr = library('wlroots', files('dummy.c'),
link_whole: [ link_whole: [
lib_wl_protos, lib_wl_protos,
lib_wlr_backend, lib_wlr_backend,
lib_wlr_render, lib_wlr_render,
lib_wlr_types, lib_wlr_types,
lib_wlr_util, lib_wlr_util,
lib_wlr_xcursor, lib_wlr_xcursor,
], ],
dependencies: _wlr_deps, 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, dependencies: _wlr_deps,
include_directories: wlr_inc) include_directories: wlr_inc)
subdir('examples') subdir('examples')

20
protocol/meson.build
View file

@ -3,27 +3,27 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
wayland_scanner_server = generator(wayland_scanner, wayland_scanner_server = generator(wayland_scanner,
output: '@BASENAME@-protocol.h', 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', output: '@BASENAME@-protocol.c',
arguments: ['code', '@INPUT@', '@OUTPUT@']) arguments: ['code', '@INPUT@', '@OUTPUT@'])
protocols = [ 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_src = []
wl_protos_headers = [] wl_protos_headers = []
foreach p : protocols foreach p : protocols
xml = join_paths(p) xml = join_paths(p)
wl_protos_src += wayland_scanner_code.process(xml) wl_protos_src += wayland_scanner_code.process(xml)
wl_protos_headers += wayland_scanner_server.process(xml) wl_protos_headers += wayland_scanner_server.process(xml)
endforeach endforeach
lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers) lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers)
wlr_protos = declare_dependency( wlr_protos = declare_dependency(
link_with: lib_wl_protos, link_with: lib_wl_protos,
sources: wl_protos_headers) sources: wl_protos_headers)

24
render/meson.build
View file

@ -1,13 +1,13 @@
lib_wlr_render = static_library('wlr_render', files( lib_wlr_render = static_library('wlr_render', files(
'egl.c', 'egl.c',
'matrix.c', 'matrix.c',
'gles2/pixel_format.c', 'gles2/pixel_format.c',
'gles2/renderer.c', 'gles2/renderer.c',
'gles2/shaders.c', 'gles2/shaders.c',
'gles2/texture.c', 'gles2/texture.c',
'gles2/util.c', 'gles2/util.c',
'wlr_renderer.c', 'wlr_renderer.c',
'wlr_texture.c', 'wlr_texture.c',
), ),
include_directories: wlr_inc, include_directories: wlr_inc,
dependencies: [glesv2, egl]) dependencies: [glesv2, egl])

28
types/meson.build
View file

@ -1,14 +1,14 @@
lib_wlr_types = static_library('wlr_types', [ lib_wlr_types = static_library('wlr_types', files(
'wlr_input_device.c', 'wlr_input_device.c',
'wlr_keyboard.c', 'wlr_keyboard.c',
'wlr_output.c', 'wlr_output.c',
'wlr_pointer.c', 'wlr_pointer.c',
'wlr_region.c', 'wlr_region.c',
'wlr_surface.c', 'wlr_surface.c',
'wlr_tablet_pad.c', 'wlr_tablet_pad.c',
'wlr_tablet_tool.c', 'wlr_tablet_tool.c',
'wlr_touch.c', 'wlr_touch.c',
'wlr_xdg_shell_v6.c', 'wlr_xdg_shell_v6.c',
], ),
include_directories: wlr_inc, include_directories: wlr_inc,
dependencies: [wayland_server, pixman, wlr_protos]) dependencies: [wayland_server, pixman, wlr_protos])

8
util/meson.build
View file

@ -1,5 +1,5 @@
lib_wlr_util = static_library('wlr_util', files( lib_wlr_util = static_library('wlr_util', files(
'list.c', 'list.c',
'log.c', 'log.c',
), ),
include_directories: wlr_inc) include_directories: wlr_inc)

8
xcursor/meson.build
View file

@ -1,5 +1,5 @@
lib_wlr_xcursor = static_library('wlr_xcursor', files( lib_wlr_xcursor = static_library('wlr_xcursor', files(
'xcursor.c', 'xcursor.c',
'wlr_cursor.c', 'wlr_cursor.c',
), ),
include_directories: wlr_inc) include_directories: wlr_inc)