From 0bed2a226301bc7392f37e5d14e8f67c7037f0eb Mon Sep 17 00:00:00 2001 From: Dudemanguy Date: Sun, 23 Jul 2023 17:54:35 -0500 Subject: build: remove outdated generated directory This only existed as essentially a workaround for meson's behavior and to maintain compatibility with the waf build. Since waf put everything in a generated subdirectory, we had to put make a subdirectory called "generated" in the source for meson so stuff could go to the right place. Well now we don't need to do that anymore. Move the meson.build files around so they go in the appropriate place in the subdirectory of the source tree and change the paths of the headers accordingly. A couple of important things to note. 1. mpv.com now gets made in build/player/mpv.com (necessary because of a meson limitation) 2. The macos icon generation path is shortened to TOOLS/osxbundle/icon.icns.inc. --- video/out/vo_dmabuf_wayland.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'video/out/vo_dmabuf_wayland.c') diff --git a/video/out/vo_dmabuf_wayland.c b/video/out/vo_dmabuf_wayland.c index ef1f767c1b..43c94882f2 100644 --- a/video/out/vo_dmabuf_wayland.c +++ b/video/out/vo_dmabuf_wayland.c @@ -41,11 +41,11 @@ #endif // Generated from wayland-protocols -#include "generated/wayland/linux-dmabuf-unstable-v1.h" -#include "generated/wayland/viewporter.h" +#include "linux-dmabuf-unstable-v1.h" +#include "viewporter.h" #if HAVE_WAYLAND_PROTOCOLS_1_27 -#include "generated/wayland/single-pixel-buffer-v1.h" +#include "single-pixel-buffer-v1.h" #endif // We need at least enough buffers to avoid a -- cgit v1.2.3