diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2023-01-27 01:59:17 +0000 |
|---|---|---|
| committer | Philip Langdale <github.philipl@overt.org> | 2023-01-26 21:39:04 -0800 |
| commit | c25682f09e6baa7f75e28dc2dd2952da55023b0f (patch) | |
| tree | 4bd6cdbdbd8f6636b86a2f7b12155491354d4234 /meson.build | |
| parent | fb137e8d88c1319071d48e52f667140b331505ae (diff) | |
| download | mpv-c25682f09e6baa7f75e28dc2dd2952da55023b0f.tar.bz2 mpv-c25682f09e6baa7f75e28dc2dd2952da55023b0f.tar.xz | |
meson: reuse libmpv objects for cplayer
When building both cplayer and libmpv in the same build previously all
sources were built twice.
By reusing the objects from libmpv in cplayer we can thus save 50%
percent of the build steps.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 8808cb1d15..4690f6c5bb 100644 --- a/meson.build +++ b/meson.build @@ -1668,15 +1668,18 @@ if win32 endif +client_h_define = cc.get_define('MPV_CLIENT_API_VERSION', prefix: '#include "libmpv/client.h"', + include_directories: include_directories('.')) +major = client_h_define.split('|')[0].split('<<')[0].strip('() ') +minor = client_h_define.split('|')[1].strip('() ') +client_api_version = major + '.' + minor + '.0' + +libmpv = library('mpv', sources, dependencies: dependencies, gnu_symbol_visibility: 'hidden', + version: client_api_version, include_directories: includedir, + install: get_option('libmpv'), build_by_default: get_option('libmpv')) + + if get_option('libmpv') - client_h_define = cc.get_define('MPV_CLIENT_API_VERSION', prefix: '#include "libmpv/client.h"', - include_directories: include_directories('.')) - major = client_h_define.split('|')[0].split('<<')[0].strip('() ') - minor = client_h_define.split('|')[1].strip('() ') - client_api_version = major + '.' + minor + '.0' - - libmpv = library('mpv', sources, dependencies: dependencies, gnu_symbol_visibility: 'hidden', - version: client_api_version, include_directories: includedir, install: true) pkg = import('pkgconfig') pkg.generate(libmpv, version: client_api_version, description: 'mpv media player client library') @@ -1717,8 +1720,8 @@ if get_option('cplayer') rename: 'mpv.svg') install_data('etc/mpv-symbolic.svg', install_dir: join_paths(hicolor_dir, 'symbolic', 'apps')) - executable('mpv', sources, dependencies: dependencies, win_subsystem: 'windows,6.0', - include_directories: includedir, install: true) + executable('mpv', objects: libmpv.extract_all_objects(recursive: true), dependencies: dependencies, + win_subsystem: 'windows,6.0', include_directories: includedir, install: true) endif summary({'d3d11': features['d3d11'], |