diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-12-31 03:58:14 +0300 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-01-08 04:34:56 +0300 |
| commit | 502204562c7458d42812dcf5c32b0cbc28150c25 (patch) | |
| tree | 04934072ab48ce4a868fd06ff742e7c413e933f5 /meson.build | |
| parent | 115fe773fe0e266a0918fbb950e1acfa5ee2b0bd (diff) | |
Fix building as a meson subproject
- When building dav1d as a dependency fallback, the parent project needs
to provide the variable name of a dependency object, added dav1d_dep for
that.
- SOURCE_ROOT is the root of the main project source tree, use
current_source_dir() instead.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 1a0e818..e323030 100644 --- a/meson.build +++ b/meson.build @@ -401,7 +401,7 @@ if is_asm_enabled and host_machine.cpu_family().startswith('x86') depfile: '@BASENAME@.obj.ndep', arguments: [ '-f', nasm_format, - '-I', '@SOURCE_DIR@/src/', + '-I', '@0@/src/'.format(meson.current_source_dir()), '-I', '@0@/'.format(meson.current_build_dir()), '-MQ', '@OUTPUT@', '-MF', '@DEPFILE@', '@EXTRA_ARGS@', |