Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
meson.build, src: update for weston 12
[src/agl-compositor.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index
55b68cb
..
99464c3
100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-11,7
+11,7
@@
project('agl-compositor',
)
config_h = configuration_data()
)
config_h = configuration_data()
-libweston_version = 'libweston-1
1
'
+libweston_version = 'libweston-1
2
'
pkgconfig = import('pkgconfig')
fs = import('fs')
pkgconfig = import('pkgconfig')
fs = import('fs')
@@
-22,6
+22,7
@@
add_project_arguments(
cc.get_supported_arguments([
'-Wno-unused-parameter',
'-Wno-pedantic',
cc.get_supported_arguments([
'-Wno-unused-parameter',
'-Wno-pedantic',
+ '-Wno-deprecated-declarations'
]),
language: 'c'
)
]),
language: 'c'
)
@@
-123,9
+124,11
@@
deps_libweston = [
dependency('wayland-server'),
dependency('weston'),
libweston_dep,
dependency('wayland-server'),
dependency('weston'),
libweston_dep,
- dependency('libweston-desktop-11'),
]
]
+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',
srcs_agl_compositor = [
'src/compositor.c',