diff options
| author | Erik Reider <[email protected]> | 2024-01-08 09:23:32 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-08 09:23:32 +0100 |
| commit | b875d712407115b381915495e50875cfc523b76d (patch) | |
| tree | 4f050bcb1a18179accd390749420d00714664691 /types | |
| parent | 6759e8da7ab53a46b0eb04e5045b8c67262c3a11 (diff) | |
| parent | cc83f41dbfc12af350c37f46677b82a64df801b8 (diff) | |
Merge pull request #27 from wlrfx/add_back_xkbcommon_dep
Meson fixes
Diffstat (limited to 'types')
| -rw-r--r-- | types/fx/shadow_data.c | 2 | ||||
| -rw-r--r-- | types/meson.build | 9 | ||||
| -rw-r--r-- | types/scene/wlr_scene.c | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/types/fx/shadow_data.c b/types/fx/shadow_data.c index fae76cf..a8ad8f9 100644 --- a/types/fx/shadow_data.c +++ b/types/fx/shadow_data.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdlib.h> #include <string.h> -#include "types/fx/shadow_data.h" +#include "scenefx/types/fx/shadow_data.h" #include "wlr/util/log.h" struct shadow_data shadow_data_get_default(void) { diff --git a/types/meson.build b/types/meson.build index 0527b7c..29e9c36 100644 --- a/types/meson.build +++ b/types/meson.build @@ -1,7 +1,12 @@ wlr_files += files( - 'output/wlr_output.c', 'scene/wlr_scene.c', - 'buffer/buffer.c', ) +if not wlroots_is_sub + wlr_files += files([ + 'output/wlr_output.c', + 'buffer/buffer.c', + ]) +endif + subdir('fx') diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c index 8ded6a8..e9f765c 100644 --- a/types/scene/wlr_scene.c +++ b/types/scene/wlr_scene.c @@ -1,6 +1,7 @@ #define _POSIX_C_SOURCE 200809L #include <assert.h> #include <stdlib.h> +#include <scenefx/types/wlr_scene.h> #include <string.h> #include <wlr/backend.h> #include <wlr/render/gles2.h> @@ -8,7 +9,6 @@ #include <wlr/types/wlr_damage_ring.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_presentation_time.h> -#include <wlr/types/wlr_scene.h> #include <wlr/types/wlr_subcompositor.h> #include <wlr/types/wlr_xdg_shell.h> #include <wlr/util/log.h> @@ -16,7 +16,7 @@ #include <wlr/render/swapchain.h> #include "render/pass.h" -#include "types/fx/shadow_data.h" +#include "scenefx/types/fx/shadow_data.h" #include "types/wlr_buffer.h" #include "types/wlr_output.h" #include "types/wlr_scene.h" |