diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-06-28 18:23:49 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-06-28 18:23:49 -0400 |
| commit | 28736c578701393f35cac2bd2ad49de18d7f879e (patch) | |
| tree | d00c341f078b38972d26a9269c83b9fabac0c496 | |
| parent | 18e6ddc1c5b091a66113ecf0d761a37980882ce3 (diff) | |
Move example -> examples
And the compositor example into its own directory
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/CMakeLists.txt (renamed from example/CMakeLists.txt) | 3 | ||||
| -rw-r--r-- | examples/cat.c (renamed from example/cat.c) | 0 | ||||
| -rw-r--r-- | examples/cat.h (renamed from example/cat.h) | 0 | ||||
| -rw-r--r-- | examples/compositor/main.c (renamed from example/compositor.c) | 2 | ||||
| -rw-r--r-- | examples/pointer.c (renamed from example/pointer.c) | 0 | ||||
| -rw-r--r-- | examples/rotation.c (renamed from example/rotation.c) | 0 | ||||
| -rw-r--r-- | examples/shared.c (renamed from example/shared.c) | 0 | ||||
| -rw-r--r-- | examples/shared.h (renamed from example/shared.h) | 0 | ||||
| -rw-r--r-- | examples/simple.c (renamed from example/simple.c) | 0 | ||||
| -rw-r--r-- | examples/tablet.c (renamed from example/tablet.c) | 0 | ||||
| -rw-r--r-- | examples/touch.c (renamed from example/touch.c) | 0 |
12 files changed, 2 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ae2397b2..b15882ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,4 +63,4 @@ add_subdirectory(session) add_subdirectory(render) add_subdirectory(util) -add_subdirectory(example) +add_subdirectory(examples) diff --git a/example/CMakeLists.txt b/examples/CMakeLists.txt index 100e110a..956ea886 100644 --- a/example/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -67,7 +67,7 @@ target_link_libraries(tablet ) add_executable(compositor - compositor + compositor/main.c shared.c ) @@ -75,6 +75,5 @@ target_link_libraries(compositor wlr-backend wlr-session wlr-render - wlr-wayland ${XKBCOMMON_LIBRARIES} ) diff --git a/example/cat.c b/examples/cat.c index 0a4dba9e..0a4dba9e 100644 --- a/example/cat.c +++ b/examples/cat.c diff --git a/example/cat.h b/examples/cat.h index 6db307fd..6db307fd 100644 --- a/example/cat.h +++ b/examples/cat.h diff --git a/example/compositor.c b/examples/compositor/main.c index a52fe460..3e83978e 100644 --- a/example/compositor.c +++ b/examples/compositor/main.c @@ -10,7 +10,6 @@ #include <wlr/render.h> #include <wlr/render/gles2.h> #include <wlr/types/wlr_output.h> -#include <wlr/wayland/wlr_compositor.h> #include <xkbcommon/xkbcommon.h> #include "shared.h" @@ -38,7 +37,6 @@ int main() { state.renderer = wlr_gles2_renderer_init(); wl_display_init_shm(compositor.display); - wlr_compositor_init(compositor.display); compositor_run(&compositor); } diff --git a/example/pointer.c b/examples/pointer.c index 8dba5454..8dba5454 100644 --- a/example/pointer.c +++ b/examples/pointer.c diff --git a/example/rotation.c b/examples/rotation.c index 84137078..84137078 100644 --- a/example/rotation.c +++ b/examples/rotation.c diff --git a/example/shared.c b/examples/shared.c index fbb6c559..fbb6c559 100644 --- a/example/shared.c +++ b/examples/shared.c diff --git a/example/shared.h b/examples/shared.h index 1633f2c8..1633f2c8 100644 --- a/example/shared.h +++ b/examples/shared.h diff --git a/example/simple.c b/examples/simple.c index 4bbdf399..4bbdf399 100644 --- a/example/simple.c +++ b/examples/simple.c diff --git a/example/tablet.c b/examples/tablet.c index 0343bd0a..0343bd0a 100644 --- a/example/tablet.c +++ b/examples/tablet.c diff --git a/example/touch.c b/examples/touch.c index 29380ed4..29380ed4 100644 --- a/example/touch.c +++ b/examples/touch.c |