diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2018-10-01 11:23:18 +0300 |
|---|---|---|
| committer | Jean-Baptiste Kempf <jb@videolan.org> | 2018-10-02 12:39:43 +0300 |
| commit | 9684908d2ffa1dc0a80a02c335d7a4302eecb13f (patch) | |
| tree | fd3737a0d80b2cd6fa15d0d51a9e2f53c37a5666 /meson.build | |
| parent | ac7438371e525f5b40bca700e5c0913ceed261fb (diff) | |
Build: Fix static library building
Due to bugs in meson the approach with the intermediate static library
for tests does not work very well, see #44. Therefore this commits
removes that helper library and instead uses extract_all_objects for
the tests.
Due to the removal of the static helper library, it means we can no
longer force static linking for dav1d tool on windows which means that
when building a shared library the dav1d.exe will not be runnable in
the build directory again.
Fix #44
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build index b5ee763..1bf915e 100644 --- a/meson.build +++ b/meson.build @@ -86,9 +86,11 @@ endif # On Windows, we use a compatibility layer to emulate pthread if host_machine.system() == 'windows' - thread_dependency = declare_dependency(sources : files('src/win32/thread.c')) + thread_dependency = [] + thread_compat_dep = declare_dependency(sources : files('src/win32/thread.c')) else thread_dependency = dependency('threads') + thread_compat_dep = [] endif |