Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dav1d
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reikah Alqazwani
dav1d
Commits
408d0486
Verified
Commit
408d0486
authored
5 years ago
by
James Almer
Browse files
Options
Downloads
Patches
Plain Diff
build: use the project version as product version in the windows resource file
And the API version as the file version.
parent
ace3855a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/dav1d.rc.in
+9
-7
9 additions, 7 deletions
src/dav1d.rc.in
src/meson.build
+6
-4
6 additions, 4 deletions
src/meson.build
with
15 additions
and
11 deletions
src/dav1d.rc.in
+
9
−
7
View file @
408d0486
#define VERSION_NUMBER @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,@VERSION_EXTRA@
#define VERSION_NUMBER_STR "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@"
#define API_VERSION_NUMBER @API_VERSION_MAJOR@,@API_VERSION_MINOR@,@API_VERSION_REVISION@,0
#define API_VERSION_NUMBER_STR "@API_VERSION_MAJOR@.@API_VERSION_MINOR@.@API_VERSION_REVISION@"
#define PROJECT_VERSION_NUMBER @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,@PROJECT_VERSION_REVISION@,0
#define PROJECT_VERSION_NUMBER_STR "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_REVISION@"
#include <windows.h>
1 VERSIONINFO
FILETYPE VFT_DLL
FILEOS VOS_NT_WINDOWS32
PRODUCTVERSION VERSION_NUMBER
FILEVERSION VERSION_NUMBER
PRODUCTVERSION
PROJECT_
VERSION_NUMBER
FILEVERSION
API_
VERSION_NUMBER
BEGIN
BLOCK "StringFileInfo"
BEGIN
...
...
@@ -15,9 +17,9 @@ BEGIN
BEGIN
VALUE "CompanyName", "VideoLAN"
VALUE "ProductName", "dav1d"
VALUE "ProductVersion", VERSION_NUMBER_STR
VALUE "FileVersion", VERSION_NUMBER_STR
VALUE "FileDescription", "dav1d AV1 decoder"
VALUE "ProductVersion",
PROJECT_
VERSION_NUMBER_STR
VALUE "FileVersion",
API_
VERSION_NUMBER_STR
VALUE "FileDescription", "dav1d
" PROJECT_VERSION_NUMBER_STR " -
AV1 decoder"
VALUE "InternalName", "dav1d"
VALUE "OriginalFilename", "libdav1d.dll"
VALUE "LegalCopyright", "Copyright \251 @COPYRIGHT_YEARS@ VideoLAN and dav1d Authors"
...
...
This diff is collapsed.
Click to expand it.
src/meson.build
+
6
−
4
View file @
408d0486
...
...
@@ -147,10 +147,12 @@ if host_machine.system() == 'windows' and get_option('default_library') != 'stat
rc_version_array
=
meson
.
project_version
().
split
(
'.'
)
winmod
=
import
(
'windows'
)
rc_data
=
configuration_data
()
rc_data
.
set
(
'VERSION_MAJOR'
,
rc_version_array
[
0
])
rc_data
.
set
(
'VERSION_MINOR'
,
rc_version_array
[
1
])
rc_data
.
set
(
'VERSION_REVISION'
,
rc_version_array
[
2
])
rc_data
.
set
(
'VERSION_EXTRA'
,
'0'
)
rc_data
.
set
(
'PROJECT_VERSION_MAJOR'
,
rc_version_array
[
0
])
rc_data
.
set
(
'PROJECT_VERSION_MINOR'
,
rc_version_array
[
1
])
rc_data
.
set
(
'PROJECT_VERSION_REVISION'
,
rc_version_array
[
2
])
rc_data
.
set
(
'API_VERSION_MAJOR'
,
dav1d_api_version_major
)
rc_data
.
set
(
'API_VERSION_MINOR'
,
dav1d_api_version_minor
)
rc_data
.
set
(
'API_VERSION_REVISION'
,
dav1d_api_version_revision
)
rc_data
.
set
(
'COPYRIGHT_YEARS'
,
'2019'
)
rc_file
=
configure_file
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment