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 | |
parent | 7b9c330bc502f7ba4899872cc7d43de95ae5136e (diff) |
Revert "Merge pull request #27 from ascent12/meson"
This reverts commit 85805da021006697c85489c3e30717c2b807441c, reversing
changes made to 8189c64d7f07a756abf5a6189719f02b2f1af967.
Diffstat (limited to 'examples')
-rw-r--r-- | examples/CMakeLists.txt | 81 | ||||
-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 | ||||
-rw-r--r-- | examples/meson.build | 23 |
5 files changed, 85 insertions, 27 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 00000000..f3f555c3 --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,81 @@ +include_directories( + ${DRM_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ${XKBCOMMON_INCLUDE_DIRS} +) + +add_executable(simple + simple.c + shared.c +) + +target_link_libraries(simple + wlr-backend + wlr-session + ${XKBCOMMON_LIBRARIES} +) + +add_executable(rotation + rotation.c + shared.c + cat.c +) + +target_link_libraries(rotation + wlr-backend + wlr-session + wlr-render + ${XKBCOMMON_LIBRARIES} +) + +add_executable(pointer + pointer.c + shared.c + cat.c +) + +target_link_libraries(pointer + wlr-backend + wlr-session + wlr-render + ${XKBCOMMON_LIBRARIES} +) + +add_executable(touch + touch.c + shared.c + cat.c +) + +target_link_libraries(touch + wlr-backend + wlr-session + wlr-render + ${XKBCOMMON_LIBRARIES} +) + +add_executable(tablet + tablet.c + shared.c +) + +target_link_libraries(tablet + wlr-backend + wlr-session + wlr-render + ${XKBCOMMON_LIBRARIES} +) + +add_executable(compositor + compositor/main.c + compositor/wl_compositor.c + compositor/wl_shell.c + shared.c +) + +target_link_libraries(compositor + wlr-backend + wlr-session + wlr-render + ${XKBCOMMON_LIBRARIES} +) 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, diff --git a/examples/meson.build b/examples/meson.build deleted file mode 100644 index 152453ae..00000000 --- a/examples/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -lib_shared = static_library('shared', - ['shared.c', 'cat.c'], - link_with: lib_wlr, - dependencies: dep_wlr) - -all_libs = [ - lib_shared, - lib_wlr, -] - -executable('simple', 'simple.c', link_with: all_libs) -executable('rotation', 'rotation.c', link_with: all_libs) -executable('pointer', 'pointer.c', link_with: all_libs) -executable('touch', 'touch.c', link_with: all_libs) -executable('tablet', 'tablet.c', link_with: all_libs) - -compositor_src = [ - 'compositor/main.c', - 'compositor/wl_compositor.c', - 'compositor/wl_shell.c', -] - -executable('compositor', compositor_src, link_with: all_libs) |