Merge pull request #27 from ascent12/meson

[Proposal] Use the Meson build system

5 files changed, 27 insertions, 85 deletions

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
deleted file mode 100644
index f3f555c3..00000000
--- a/examples/CMakeLists.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-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 6a689669..d59ef7a8 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 0cd73afb..198e0a34 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 f2ec3c56..9067ef09 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
new file mode 100644
index 00000000..152453ae
--- /dev/null
+++ b/examples/meson.build
@@ -0,0 +1,23 @@
+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)