Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: don't add libmpv and cplayer features to conf_data

Browse Source 
Core code should not use these features as it would mean that a libmpv
build could change an mpv executable and vice-versa.
Also changing one of them should not force a full recompile of the other
one through a change to config.h.
This commit is contained in:
Thomas Weißschuh
2023-01-19 02:46:26 +00:00
committed by Dudemanguy
parent 491aaacca6
commit ede8d29408
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@@ -1606,9 +1606,6 @@ configuration = 'meson configure build ' + '-Dprefix=' + get_option('prefix') +
' -Dbuildtype=' + get_option('buildtype') + \
' -Doptimization=' + get_option('optimization')
features += {'cplayer': get_option('cplayer')}
features += {'libmpv-' + get_option('default_library'): get_option('libmpv')}
# Set config.h
conf_data = configuration_data()
@@ -1645,6 +1642,10 @@ conf_data.set_quoted('MPV_CONFDIR', join_paths(get_option('prefix'), get_option(
configure_file(output : 'config.h', configuration : conf_data)
message('List of enabled features: ' + feature_str)
# These are intentionally not added to conf_data.
features += {'cplayer': get_option('cplayer')}
features += {'libmpv-' + get_option('default_library'): get_option('libmpv')}
# build targets
if win32