aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-11-06 08:09:26 +0100
committeremersion <contact@emersion.fr>2018-11-06 08:29:30 +0100
commita8bc8c65ce63abbe15ceeaf0460b11265cdf5c29 (patch)
tree8ad9cb3f24eee5f76e06f250b9c5884e7238b5d2
parent2d0c5ec78eb975981b1d194fa9d4bc80b894748d (diff)
examples: only link clients to wlroots if necessary
-rw-r--r--examples/idle.c4
-rw-r--r--examples/input-method.c2
-rw-r--r--examples/meson.build17
3 files changed, 10 insertions, 13 deletions
diff --git a/examples/idle.c b/examples/idle.c
index 3e1565ca..a6a4f5c0 100644
--- a/examples/idle.c
+++ b/examples/idle.c
@@ -1,12 +1,12 @@
#include <getopt.h>
#include <pthread.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <wayland-client-protocol.h>
#include <wayland-client.h>
-#include <wlr/util/log.h>
#include "idle-client-protocol.h"
static struct org_kde_kwin_idle *idle_manager = NULL;
@@ -109,8 +109,6 @@ void *main_loop(void *data) {
}
int main(int argc, char *argv[]) {
- wlr_log_init(WLR_DEBUG, NULL);
-
if (parse_args(argc, argv) != 0) {
return -1;
}
diff --git a/examples/input-method.c b/examples/input-method.c
index 3e485d1c..4e375306 100644
--- a/examples/input-method.c
+++ b/examples/input-method.c
@@ -1,6 +1,7 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <errno.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -9,7 +10,6 @@
#include <unistd.h>
#include <wayland-client.h>
#include <wayland-egl.h>
-#include <wlr/render/egl.h>
#include "input-method-unstable-v2-client-protocol.h"
#include "text-input-unstable-v3-client-protocol.h"
#include "xdg-shell-client-protocol.h"
diff --git a/examples/meson.build b/examples/meson.build
index 90dbeca8..cbf39347 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -59,7 +59,7 @@ examples = {
},
'idle': {
'src': 'idle.c',
- 'dep': [wayland_client, wlr_protos, wlroots, threads],
+ 'dep': [wayland_client, wlr_protos, threads],
},
'idle-inhibit': {
'src': 'idle-inhibit.c',
@@ -75,7 +75,7 @@ examples = {
},
'gamma-control': {
'src': 'gamma-control.c',
- 'dep': [wayland_client, wayland_cursor, wlr_protos, wlroots],
+ 'dep': [wayland_client, wayland_cursor, wlr_protos, math],
},
'pointer-constraints': {
'src': 'pointer-constraints.c',
@@ -91,7 +91,6 @@ examples = {
threads,
wayland_client,
wlr_protos,
- wlroots,
],
},
'screencopy': {
@@ -103,13 +102,13 @@ examples = {
'dep': [wayland_client, wlr_protos, wlroots],
},
'input-method': {
- 'src': 'input-method.c',
- 'dep': [wayland_client, wlr_protos, wlroots] + libepoll,
- },
+ 'src': 'input-method.c',
+ 'dep': [wayland_client, wlr_protos] + libepoll,
+ },
'text-input': {
- 'src': 'text-input.c',
- 'dep': [wayland_cursor, wayland_client, wlr_protos, wlroots],
- },
+ 'src': 'text-input.c',
+ 'dep': [wayland_cursor, wayland_client, wlr_protos, wlroots],
+ },
}
foreach name, info : examples