diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-09 17:06:15 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-12 17:28:36 +0300 |
| commit | 408d0486889f4f6d92f73abdeaef250659a10bc7 (patch) | |
| tree | 4e28df6d4e7d3b3b832f2b7ba899f5609b36eb03 | |
| parent | ace3855a60379a76624bc01d74bae7fc40233c54 (diff) | |
build: use the project version as product version in the windows resource file0.2.1
And the API version as the file version.
| -rw-r--r-- | src/dav1d.rc.in | 16 | ||||
| -rw-r--r-- | src/meson.build | 10 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/dav1d.rc.in b/src/dav1d.rc.in index bb38369..ad6aab4 100644 --- a/src/dav1d.rc.in +++ b/src/dav1d.rc.in @@ -1,13 +1,15 @@ -#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" diff --git a/src/meson.build b/src/meson.build index 38be131..1feeb13 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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( |