ref: 48ccacc1bc61b8688ba8f8d9fafab48f5070a915
parent: 1abd783be7ba902290e0f906eb35679c3ece419b
author: Shiz <hi@shiz.me>
date: Sat Sep 22 10:19:55 EDT 2018
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.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,6 @@
- amd64
script:
- meson build --buildtype release
- - ninja -v -C build include/version.h
- ninja -v -C build
build-win32:
@@ -19,7 +18,6 @@
- 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 @@
- 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
--- a/meson.build
+++ b/meson.build
@@ -193,7 +193,7 @@
)
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 @@
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,