X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=5c1cb9e847a9102fbf1899b20851d37134229465;hb=ee9259703dc1d46339197c0d3a30e18556d708c9;hp=37eb26a68916994b27d5324cd27eda0ba1a8447e;hpb=dbba1adda7fd9aaaa46263d8c878132a523327e4;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 37eb26a..5c1cb9e 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,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-agl_compositor_version = '0.0.15'
+agl_compositor_version = '0.0.18'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -46,10 +46,12 @@ 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 = [
   { 'name': 'agl-shell', 'source': 'internal' },
+  { 'name': 'agl-shell-desktop', 'source': 'internal' },
   { 'name': 'xdg-shell', 'source': 'wp-stable' },
 ]
 
@@ -105,12 +107,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-8')
 
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-7'),
+  dependency('libweston-desktop-8'),
   local_dep,
 ]
 
@@ -118,11 +120,15 @@ 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',
 	agl_shell_server_protocol_h,
+	agl_shell_desktop_server_protocol_h,
 	agl_shell_protocol_c,
+	agl_shell_desktop_protocol_c,
 	xdg_shell_protocol_c,
 ]
 
@@ -174,6 +180,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)
 )