X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=292308a3e22877a82ae08056f401c867395dd35f;hb=refs%2Fchanges%2F91%2F29791%2F1;hp=0357b2914ea7a1c4091736adeab648d02f25dfaf;hpb=e7ccf51adc37748d3ca000109d16d0495dc0a7e8;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index 0357b29..292308a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c','cpp',
-  version: '0.0.22',
+  version: '0.0.24',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -11,7 +11,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-libweston_version = 'libweston-10'
+libweston_version = 'libweston-13'
 pkgconfig = import('pkgconfig')
 fs = import('fs')
 
@@ -22,6 +22,7 @@ add_project_arguments(
   cc.get_supported_arguments([
     '-Wno-unused-parameter',
     '-Wno-pedantic',
+    '-Wno-deprecated-declarations'
   ]),
   language: 'c'
 )
@@ -42,7 +43,7 @@ foreach func: optional_libc_funcs
 endforeach
 
 dep_libsystemd = dependency('libsystemd', required: false)
-dep_scanner = dependency('wayland-scanner')
+dep_scanner = dependency('wayland-scanner', native: true)
 prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
 dep_wp = dependency('wayland-protocols', version: '>= 1.18')
 dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
@@ -123,9 +124,11 @@ deps_libweston = [
   dependency('wayland-server'),
   dependency('weston'),
   libweston_dep,
-  dependency('libweston-desktop-10'),
 ]
 
+weston_module_dir = libweston_dep.get_pkgconfig_variable('libdir')
+config_h.set_quoted('WESTON_MODULEDIR', join_paths(weston_module_dir, 'weston'))
+config_h.set_quoted('LIBWESTON_MODULEDIR', join_paths(weston_module_dir, libweston_version))
 
 srcs_agl_compositor = [
 	'src/compositor.c',