X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=6c8515468524880eaaf889a16e96628a037af940;hb=121ceb70ae61c4a146905f5f8aef6202ea318cf7;hp=82bb9909c35e7841ea778d2b7283cb1638312e8b;hpb=68d184f9d541a475e15727d71f49b6df6799a054;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 82bb990..6c85154 100644
--- a/meson.build
+++ b/meson.build
@@ -11,7 +11,7 @@ project('agl-compositor',
 
 config_h = configuration_data()
 agl_compositor_version = '0.0.19'
-libweston_version = 'libweston-8'
+libweston_version = 'libweston-9'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -19,6 +19,7 @@ cxx = meson.get_compiler('cpp')
 
 add_project_arguments(
   cc.get_supported_arguments([
+    '-Wno-missing-field-initializers',
     '-Wno-unused-parameter',
     '-Wno-pedantic',
     '-Wextra',
@@ -91,9 +92,11 @@ xdg_shell_xml = join_paths(dir_wp_base, 'stable', 'xdg-shell', 'xdg-shell.xml')
 
 protocols = [
   { 'name': 'agl-shell', 'source': 'internal' },
+  { 'name': 'weston-test', 'source': 'internal' },
   { 'name': 'agl-shell-desktop', 'source': 'internal' },
   { 'name': 'agl-screenshooter', 'source': 'internal' },
   { 'name': 'xdg-shell', 'source': 'wp-stable' },
+  { 'name': 'viewporter', 'source': 'wp-stable' },
   { 'name': 'xdg-output', 'source': 'unstable', 'version': 'v1' },
 ]
 
@@ -154,12 +157,13 @@ libweston_dep = dependency(libweston_version)
 deps_libweston = [
   dependency('wayland-server'),
   libweston_dep,
-  dependency('libweston-desktop-8'),
+  dependency('libweston-desktop-9'),
   local_dep,
 ]
 
+
 srcs_agl_compositor = [
-	'src/main.c',
+	'src/compositor.c',
 	'src/desktop.c',
 	'src/layout.c',
 	'src/policy.c',
@@ -190,7 +194,6 @@ elif policy_to_install == 'rba'
   message('Installing rba policy')
 endif
 
-
 # From meson documentation:
 # In order to look for headers in a specific directory you can use args :
 # '-I/extra/include/dir, but this should only be used in exceptional cases for
@@ -237,12 +240,28 @@ if dep_libsmack.found()
   deps_libweston += dep_libsmack
 endif
 
+
+libexec_compositor = shared_library(
+        'exec_compositor',
+        sources: srcs_agl_compositor,
+        dependencies: deps_libweston,
+        install: true,
+        version: '0.0.0',
+        soversion: 0
+)
+
+dep_libexec_compositor = declare_dependency(
+        link_with: libexec_compositor,
+        include_directories: [ include_directories('.') ],
+        dependencies: deps_libweston,
+)
+
 configure_file(output: 'config.h', configuration: config_h)
 
 exe_agl_compositor = executable(
 	'agl-compositor',
-	srcs_agl_compositor,
-	dependencies: deps_libweston,
+	'src/main.c',
+	dependencies: dep_libexec_compositor,
 	install: true
 )
 
@@ -265,3 +284,4 @@ install_data(
 
 common_inc = [ include_directories('src'), include_directories('.') ]
 subdir('clients')
+subdir('tests')