Commit 7f7b5586 authored by Janne Grunau's avatar Janne Grunau

build: add "api" to api/soname related versions

Refs #241, Closes #255.
parent 79052b17
Pipeline #5402 passed with stages
in 5 minutes and 59 seconds
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
# installed version.h header generation # installed version.h header generation
version_h_data = configuration_data() version_h_data = configuration_data()
version_h_data.set('DAV1D_VERSION_MAJOR', dav1d_version_major) version_h_data.set('DAV1D_API_VERSION_MAJOR', dav1d_api_version_major)
version_h_data.set('DAV1D_VERSION_MINOR', dav1d_version_minor) version_h_data.set('DAV1D_API_VERSION_MINOR', dav1d_api_version_minor)
version_h_data.set('DAV1D_VERSION_PATCH', dav1d_version_revision) version_h_data.set('DAV1D_API_VERSION_PATCH', dav1d_api_version_revision)
version_h_target = configure_file(input: 'version.h.in', version_h_target = configure_file(input: 'version.h.in',
output: 'version.h', output: 'version.h',
configuration: version_h_data) configuration: version_h_data)
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#ifndef DAV1D_VERSION_H #ifndef DAV1D_VERSION_H
#define DAV1D_VERSION_H #define DAV1D_VERSION_H
#define DAV1D_VERSION_MAJOR @DAV1D_VERSION_MAJOR@ #define DAV1D_API_VERSION_MAJOR @DAV1D_API_VERSION_MAJOR@
#define DAV1D_VERSION_MINOR @DAV1D_VERSION_MINOR@ #define DAV1D_API_VERSION_MINOR @DAV1D_API_VERSION_MINOR@
#define DAV1D_VERSION_PATCH @DAV1D_VERSION_PATCH@ #define DAV1D_API_VERSION_PATCH @DAV1D_API_VERSION_PATCH@
#endif /* DAV1D_VERSION_H */ #endif /* DAV1D_VERSION_H */
...@@ -31,10 +31,10 @@ project('dav1d', ['c'], ...@@ -31,10 +31,10 @@ project('dav1d', ['c'],
meson_version: '>= 0.47.0') meson_version: '>= 0.47.0')
dav1d_soname_version = '1.0.1' dav1d_soname_version = '1.0.1'
dav1d_version_array = dav1d_soname_version.split('.') dav1d_api_version_array = dav1d_soname_version.split('.')
dav1d_version_major = dav1d_version_array[0] dav1d_api_version_major = dav1d_api_version_array[0]
dav1d_version_minor = dav1d_version_array[1] dav1d_api_version_minor = dav1d_api_version_array[1]
dav1d_version_revision = dav1d_version_array[2] dav1d_api_version_revision = dav1d_api_version_array[2]
dav1d_src_root = meson.current_source_dir() dav1d_src_root = meson.current_source_dir()
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
......
...@@ -201,7 +201,7 @@ endforeach ...@@ -201,7 +201,7 @@ endforeach
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
dav1d_soversion = '' dav1d_soversion = ''
else else
dav1d_soversion = dav1d_version_major dav1d_soversion = dav1d_api_version_major
endif endif
libdav1d = library('dav1d', libdav1d = library('dav1d',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment