summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-03-15 12:48:21 +0200
committerMarius Vlad <marius.vlad@collabora.com>2023-03-15 13:47:56 +0200
commit2e91c40bde5253a30716092af31e4cf07febda44 (patch)
tree3c39918ab90624db2fbca5d01f82f5df526a0d09
parent1a359aa6e263f2476c6557ea7f19756ab318b35f (diff)
meson.build: Add an explicit weston dependency
Required when building the compositor locally, without yocto/OE as weston cflags includes the full path to weston. Bug-AGL: SPEC-4725 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: If3a4e8238cb40c6fbe0db26bd1056fce48243038
-rw-r--r--meson.build1
-rw-r--r--src/compositor.c2
-rw-r--r--src/main.c2
-rw-r--r--src/shell.c2
4 files changed, 4 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 463b0fe..388f785 100644
--- a/meson.build
+++ b/meson.build
@@ -141,6 +141,7 @@ libweston_dep = dependency(libweston_version)
deps_libweston = [
dependency('wayland-server'),
+ dependency('weston'),
libweston_dep,
dependency('libweston-desktop-10'),
]
diff --git a/src/compositor.c b/src/compositor.c
index 60d5dd2..5ef3b34 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -49,7 +49,7 @@
#include <libweston/windowed-output-api.h>
#include <libweston/config-parser.h>
#include <libweston/weston-log.h>
-#include <weston/weston.h>
+#include <weston.h>
#include "shared/os-compatibility.h"
#include "shared/helpers.h"
diff --git a/src/main.c b/src/main.c
index d1390f0..8056a9d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include <weston/weston.h>
+#include <weston.h>
int main(int argc, char *argv[])
{
diff --git a/src/shell.c b/src/shell.c
index ddb8981..db9638f 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -38,7 +38,7 @@
#include <libweston/libweston.h>
#include <libweston/config-parser.h>
-#include <weston/weston.h>
+#include <weston.h>
#include "shared/os-compatibility.h"
#include "shared/helpers.h"
#include "shared/process-util.h"