Merge branch 'master' into rootston

This commit is contained in:
Drew DeVault 2017-09-25 08:29:35 -04:00
commit f4387b437f
56 changed files with 376 additions and 121 deletions

View file

@ -20,6 +20,7 @@ add_project_link_arguments(
)
wlr_inc = include_directories('include')
install_subdir('include/wlr', install_dir: 'include')
cc = meson.get_compiler('c')
@ -103,6 +104,7 @@ lib_wlr = library(
],
dependencies: wlr_deps,
include_directories: wlr_inc,
install: true,
)
wlroots = declare_dependency(
@ -113,3 +115,12 @@ wlroots = declare_dependency(
subdir('rootston')
subdir('examples')
pkgconfig = import('pkgconfig')
pkgconfig.generate(
libraries: lib_wlr,
version: '0.0.1',
filebase: 'wlroots',
name: 'wlroots',
description: 'Wayland compositor library',
)