diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-07-23 17:54:35 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-07-31 19:00:06 +0000 |
| commit | 0bed2a226301bc7392f37e5d14e8f67c7037f0eb (patch) | |
| tree | 96a6f2897d4ef505c26fb76cc8920b8d39279ea0 /demux | |
| parent | b3b7ee8f4c07f1174140e7612e25dca9a23e6cbb (diff) | |
| download | mpv-0bed2a226301bc7392f37e5d14e8f67c7037f0eb.tar.bz2 mpv-0bed2a226301bc7392f37e5d14e8f67c7037f0eb.tar.xz | |
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.
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/ebml.c | 2 | ||||
| -rw-r--r-- | demux/ebml.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demux/ebml.c b/demux/ebml.c index 977bff43ee..7f62f1ff90 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -222,7 +222,7 @@ int ebml_resync_cluster(struct mp_log *log, stream_t *s) #define E_S(str, count) EVALARGS(E_SN, str, count, N) #define FN(id, name, multiple, N) { id, multiple, offsetof(struct ebml_ ## N, name), offsetof(struct ebml_ ## N, n_ ## name), &ebml_##name##_desc}, #define F(id, name, multiple) EVALARGS(FN, id, name, multiple, N) -#include "generated/ebml_defs.inc" +#include "ebml_defs.inc" #undef EVALARGS #undef SN #undef S diff --git a/demux/ebml.h b/demux/ebml.h index ceac05e00c..86a40092b6 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -63,7 +63,7 @@ struct ebml_parse_ctx { bool no_error_messages; }; -#include "generated/ebml_types.h" +#include "ebml_types.h" #define EBML_ID_INVALID 0xffffffff |