diff options
| author | Dudemanguy <random342@airmail.cc> | 2021-10-18 20:04:30 -0500 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2021-11-14 19:13:10 +0000 |
| commit | f610fe16c0b1cb74d73d02dc55792d4ddc262ad2 (patch) | |
| tree | bb5eee920a78e8ff1481184f8c59bbe87166bcbb | |
| parent | 94950b1b2275cd820f6f9d6a1df581a93bea532a (diff) | |
| download | mpv-f610fe16c0b1cb74d73d02dc55792d4ddc262ad2.tar.bz2 mpv-f610fe16c0b1cb74d73d02dc55792d4ddc262ad2.tar.xz | |
demux_edl: rename ebml_defs.c to ebml_defs.inc
The extension is completely arbitrary since ebml_defs.c isn't a real c
file that actually is compiled at any point in time. It's just used as
an include. The reason for changing the extension is because meson needs
to add this to its list of sources for dependency/ordering purposes.
Understandably, meson will try to compile any .c file added to a c
project executable object. Obviously, this compilation will never
succeed, and this shouldn't be compiled anyways. Just make it .inc
instead.
| -rw-r--r-- | demux/ebml.c | 2 | ||||
| -rw-r--r-- | wscript_build.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demux/ebml.c b/demux/ebml.c index 477e335a2f..5bb8fd83d3 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -224,7 +224,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.c" +#include "generated/ebml_defs.inc" #undef EVALARGS #undef SN #undef S diff --git a/wscript_build.py b/wscript_build.py index ace0fb1b18..c0dd23bb1c 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -129,7 +129,7 @@ def build(ctx): target = "generated/wayland/xdg-decoration-unstable-v1.h") ctx(features = "ebml_header", target = "generated/ebml_types.h") - ctx(features = "ebml_definitions", target = "generated/ebml_defs.c") + ctx(features = "ebml_definitions", target = "generated/ebml_defs.inc") def swift(task): src = [x.abspath() for x in task.inputs] |