Revert "Merge pull request #27 from ascent12/meson"

This reverts commit 85805da021, reversing
changes made to 8189c64d7f.
This commit is contained in:
Drew DeVault 2017-07-11 22:16:56 -04:00
parent 7b9c330bc5
commit b08aa9fd35
34 changed files with 996 additions and 152 deletions

81
examples/CMakeLists.txt Normal file
View file

@ -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}
)

View file

@ -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;

View file

@ -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) {

View file

@ -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,

View file

@ -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)