X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=9040f481e5136d105e78f3185d1abd2af924376a;hb=refs%2Fchanges%2F08%2F24508%2F8;hp=cfe446d99024dc340029c3d5f8ead6b14db2c29c;hpb=98457c49f5d777e4023082363b814826c21092df;p=src%2Fagl-compositor.git diff --git a/meson.build b/meson.build index cfe446d..9040f48 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('agl-compositor', 'c', - version: '0.0.16', + version: '0.0.18', default_options: [ 'warning_level=3', 'c_std=gnu99', @@ -10,7 +10,8 @@ project('agl-compositor', ) config_h = configuration_data() -agl_compositor_version = '0.0.16' +agl_compositor_version = '0.0.18' +libweston_version = 'libweston-8' pkgconfig = import('pkgconfig') cc = meson.get_compiler('c') @@ -107,12 +108,12 @@ endif dir_data = join_paths(prefix_path, get_option('datadir')) dir_data_agl_compositor = join_paths('agl-compositor', 'protocols') dir_data_pc = join_paths(dir_data, 'pkgconfig') -libweston_dep = dependency('libweston-7') +libweston_dep = dependency(libweston_version) deps_libweston = [ dependency('wayland-server'), libweston_dep, - dependency('libweston-desktop-7'), + dependency('libweston-desktop-8'), local_dep, ] @@ -121,6 +122,7 @@ srcs_agl_compositor = [ 'src/desktop.c', 'src/layout.c', 'src/policy.c', + 'src/policy-default.c', 'src/shell.c', 'shared/option-parser.c', 'shared/os-compatibility.c', @@ -137,9 +139,9 @@ srcs_agl_compositor = [ # includes that can't be detected via pkg-config and passed via dependencies. if libweston_dep.found() if not prefix_path.contains('/usr') - dir_path_x11_backend = join_paths(prefix_path, 'include', 'libweston-7', 'libweston', 'backend-x11.h') + dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h') else - dir_path_x11_backend = join_paths('libweston-7', 'libweston', 'backend-x11.h') + dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h') endif # do the test