diff options
| author | Shiz <hi@shiz.me> | 2018-09-22 15:19:55 +0300 |
|---|---|---|
| committer | Shiz <hi@shiz.me> | 2018-09-27 16:54:10 +0300 |
| commit | 48ccacc1bc61b8688ba8f8d9fafab48f5070a915 (patch) | |
| tree | 0ef02b434cc24582c8ad6e66414ef204ec728a9a | |
| parent | 1abd783be7ba902290e0f906eb35679c3ece419b (diff) | |
build: fix incorrect version.h dependency
The build system declared `rev_target` to be a dependency of
libdav1d instead of libdav1dentrypoint. This causes initial builds
to fail, as it is `src/lib.c` from libdav1dentrypoint that includes
this file. Move the dependency to libdav1dentrypoint to fix this.
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3b6040..a6824f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ build-debian: - amd64 script: - meson build --buildtype release - - ninja -v -C build include/version.h - ninja -v -C build build-win32: @@ -19,7 +18,6 @@ build-win32: - win32 script: - meson build --buildtype release --cross-file /opt/crossfiles/i686-w64-mingw32.meson - - ninja -v -C build include/version.h - ninja -v -C build build-win64: @@ -29,5 +27,4 @@ build-win64: - win64 script: - meson build --buildtype release --cross-file /opt/crossfiles/x86_64-w64-mingw32.meson - - ninja -v -C build include/version.h - ninja -v -C build diff --git a/meson.build b/meson.build index 9b6854f..67dfa32 100644 --- a/meson.build +++ b/meson.build @@ -193,7 +193,7 @@ entrypoints_src = files( ) entrypoints_lib = static_library( 'libdav1dentrypoint', - entrypoints_src, + entrypoints_src, rev_target, include_directories: dav1d_inc_dirs, c_args: stackrealign_flag, install: false, @@ -280,7 +280,7 @@ foreach bitdepth : dav1d_bitdepths endforeach libdav1d = library('dav1d', - libdav1d_sources, rev_target, nasm_objs, + libdav1d_sources, nasm_objs, version: '0.0.1', objects: [bitdepth_objs, entrypoints_objs], include_directories: dav1d_inc_dirs, |