RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Dudemanguy 2021-10-18 20:04:30 -05:00
parent 94950b1b22
commit f610fe16c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/ebml.c
View File

@ -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 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 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) #define F(id, name, multiple) EVALARGS(FN, id, name, multiple, N)
#include "generated/ebml_defs.c" #include "generated/ebml_defs.inc"
#undef EVALARGS #undef EVALARGS
#undef SN #undef SN
#undef S #undef S

2
wscript_build.py
View File

@ -129,7 +129,7 @@ def build(ctx):
target = "generated/wayland/xdg-decoration-unstable-v1.h") target = "generated/wayland/xdg-decoration-unstable-v1.h")
ctx(features = "ebml_header", target = "generated/ebml_types.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): def swift(task):
src = [x.abspath() for x in task.inputs] src = [x.abspath() for x in task.inputs]