From b08aa9fd35d650b15a5322bd1b6edea01f152f27 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 11 Jul 2017 22:16:56 -0400 Subject: Revert "Merge pull request #27 from ascent12/meson" This reverts commit 85805da021006697c85489c3e30717c2b807441c, reversing changes made to 8189c64d7f07a756abf5a6189719f02b2f1af967. --- backend/CMakeLists.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ backend/meson.build | 19 ------------------- 2 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 backend/CMakeLists.txt delete mode 100644 backend/meson.build (limited to 'backend') diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt new file mode 100644 index 00000000..5486b302 --- /dev/null +++ b/backend/CMakeLists.txt @@ -0,0 +1,42 @@ +include_directories( + ${PROTOCOLS_INCLUDE_DIRS} + ${WAYLAND_INCLUDE_DIR} + ${DRM_INCLUDE_DIRS} + ${LIBINPUT_INCLUDE_DIRS} +) + +add_library(wlr-backend + wayland/backend.c + wayland/registry.c + wayland/wl_seat.c + wayland/output.c + drm/backend.c + drm/drm.c + + libinput/backend.c + libinput/events.c + libinput/keyboard.c + libinput/pointer.c + libinput/touch.c + libinput/tablet_tool.c + libinput/tablet_pad.c + + multi/backend.c + backend.c + egl.c + udev.c +) + +target_link_libraries(wlr-backend + wlr-util + wlr-types + ${WAYLAND_LIBRARIES} + ${DRM_LIBRARIES} + ${GBM_LIBRARIES} + ${GLESv2_LIBRARIES} + ${EGL_LIBRARIES} + ${SYSTEMD_LIBRARIES} + ${UDEV_LIBRARIES} + ${LIBINPUT_LIBRARIES} + ${GBM_LIBRARIES} +) diff --git a/backend/meson.build b/backend/meson.build deleted file mode 100644 index 02b79e65..00000000 --- a/backend/meson.build +++ /dev/null @@ -1,19 +0,0 @@ -wlr_files += files( - 'backend.c', - 'egl.c', - 'udev.c', - 'drm/backend.c', - 'drm/drm.c', - 'libinput/backend.c', - 'libinput/events.c', - 'libinput/keyboard.c', - 'libinput/pointer.c', - 'libinput/tablet_pad.c', - 'libinput/tablet_tool.c', - 'libinput/touch.c', - 'multi/backend.c', - 'wayland/backend.c', - 'wayland/output.c', - 'wayland/registry.c', - 'wayland/wl_seat.c', -) -- cgit v1.2.3