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
compositor: Add support for building Xwayland
[src/agl-compositor.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index
372c76c
..
9b942f0
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
0
'
+libweston_version = 'libweston-1
3
'
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'
)
@@
-42,7
+43,7
@@
foreach func: optional_libc_funcs
endforeach
dep_libsystemd = dependency('libsystemd', required: false)
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')
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('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',
srcs_agl_compositor = [
'src/compositor.c',
@@
-168,17
+171,17
@@
if libweston_dep.found()
if not meson.is_cross_build()
if not prefix_path.contains('/usr')
dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
if not meson.is_cross_build()
if not prefix_path.contains('/usr')
dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
- dir_path_
headless_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-headless
.h')
+ dir_path_
wayland_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-wayland
.h')
dir_path_rdp_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-rdp.h')
else
dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
dir_path_rdp_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-rdp.h')
else
dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
- dir_path_
headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless
.h')
- dir_path_rdp = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
+ dir_path_
wayland_backend = join_paths(libweston_version, 'libweston', 'backend-wayland
.h')
+ dir_path_rdp
_backend
= join_paths(libweston_version, 'libweston', 'backend-rdp.h')
endif
else
message('Building with cross environment')
dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
endif
else
message('Building with cross environment')
dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
- dir_path_
headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless
.h')
+ dir_path_
wayland_backend = join_paths(libweston_version, 'libweston', 'backend-wayland
.h')
dir_path_rdp_backend = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
endif
dir_path_rdp_backend = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
endif
@@
-188,9
+191,9
@@
if libweston_dep.found()
message('Building with X11 backend')
endif
message('Building with X11 backend')
endif
- if cc.has_header(dir_path_
headless
_backend)
- config_h.set('HAVE_BACKEND_
HEADLESS
', 1)
- message('Building with
headless
backend')
+ if cc.has_header(dir_path_
wayland
_backend)
+ config_h.set('HAVE_BACKEND_
WAYLAND
', 1)
+ message('Building with
Wayland
backend')
endif
if cc.has_header(dir_path_rdp_backend)
endif
if cc.has_header(dir_path_rdp_backend)
@@
-217,6
+220,8
@@
if get_option('xwayland')
config_h.set('BUILD_XWAYLAND', '1')
srcs_agl_compositor += 'src/xwayland.c'
config_h.set('BUILD_XWAYLAND', '1')
srcs_agl_compositor += 'src/xwayland.c'
+ srcs_agl_compositor += 'shared/xalloc.c'
+ srcs_agl_compositor += 'shared/process-util.c'
config_h.set_quoted('XSERVER_PATH', get_option('xwayland-path'))
endif
config_h.set_quoted('XSERVER_PATH', get_option('xwayland-path'))
endif