X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=9040f481e5136d105e78f3185d1abd2af924376a;hb=7af3d3760c29157282348648d893af285b7efb34;hp=aa6921892f00e1583dee693f6e4d23422791ce95;hpb=a35a7f2e5cc20bd40ece91918e753c709e2ee10b;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index aa69218..9040f48 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.15',
+  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.15'
+agl_compositor_version = '0.0.18'
+libweston_version = 'libweston-8'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -46,6 +47,7 @@ dep_wp = dependency('wayland-protocols', version: '>= 1.18')
 dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
 
 agl_shell_xml = files('protocol/agl-shell.xml')
+agl_shell_desktop_xml = files('protocol/agl-shell-desktop.xml')
 xdg_shell_xml = join_paths(dir_wp_base, 'stable', 'xdg-shell', 'xdg-shell.xml')
 
 protocols = [
@@ -106,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,
 ]
 
@@ -119,6 +121,8 @@ srcs_agl_compositor = [
 	'src/main.c',
 	'src/desktop.c',
 	'src/layout.c',
+	'src/policy.c',
+	'src/policy-default.c',
 	'src/shell.c',
 	'shared/option-parser.c',
 	'shared/os-compatibility.c',
@@ -135,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
@@ -177,6 +181,6 @@ pkgconfig.generate(
 )
 
 install_data(
-        [ agl_shell_xml ],
+        [ agl_shell_xml, agl_shell_desktop_xml ],
         install_dir: join_paths(dir_data, dir_data_agl_compositor)
 )