diff options
| author | Drew DeVault <ddevault@vistarmedia.com> | 2017-07-11 22:16:56 -0400 |
|---|---|---|
| committer | Drew DeVault <ddevault@vistarmedia.com> | 2017-07-11 22:16:56 -0400 |
| commit | b08aa9fd35d650b15a5322bd1b6edea01f152f27 (patch) | |
| tree | 26a5b75622d0a750478dee5c8a5d99f5b75846b6 /examples/compositor | |
| parent | 7b9c330bc502f7ba4899872cc7d43de95ae5136e (diff) | |
Revert "Merge pull request #27 from ascent12/meson"
This reverts commit 85805da021006697c85489c3e30717c2b807441c, reversing
changes made to 8189c64d7f07a756abf5a6189719f02b2f1af967.
Diffstat (limited to 'examples/compositor')
| -rw-r--r-- | examples/compositor/main.c | 4 | ||||
| -rw-r--r-- | examples/compositor/wl_compositor.c | 2 | ||||
| -rw-r--r-- | examples/compositor/wl_shell.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/compositor/main.c b/examples/compositor/main.c index d59ef7a8..6a689669 100644 --- a/examples/compositor/main.c +++ b/examples/compositor/main.c @@ -11,8 +11,8 @@ #include <wlr/render/gles2.h> #include <wlr/types/wlr_output.h> #include <xkbcommon/xkbcommon.h> -#include "../shared.h" -#include "../compositor.h" +#include "shared.h" +#include "compositor.h" struct sample_state { struct wlr_renderer *renderer; diff --git a/examples/compositor/wl_compositor.c b/examples/compositor/wl_compositor.c index 198e0a34..0cd73afb 100644 --- a/examples/compositor/wl_compositor.c +++ b/examples/compositor/wl_compositor.c @@ -1,7 +1,7 @@ #include <assert.h> #include <wayland-server.h> #include <wlr/util/log.h> -#include "../compositor.h" +#include "compositor.h" static void wl_compositor_create_surface(struct wl_client *client, struct wl_resource *resource, uint32_t id) { diff --git a/examples/compositor/wl_shell.c b/examples/compositor/wl_shell.c index 9067ef09..f2ec3c56 100644 --- a/examples/compositor/wl_shell.c +++ b/examples/compositor/wl_shell.c @@ -1,7 +1,7 @@ #include <assert.h> #include <wayland-server.h> #include <wlr/util/log.h> -#include "../compositor.h" +#include "compositor.h" void wl_shell_get_shell_surface(struct wl_client *client, struct wl_resource *resource, uint32_t id, |