Skip to content
Extraits de code Groupes Projets
Valider 3ca8193a rédigé par Ryan Lucia's avatar Ryan Lucia Validation de line0
Parcourir les fichiers

meson: rename option for optional dependencies

parent 0ab47f2b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -67,11 +67,11 @@ foreach dep: [ ...@@ -67,11 +67,11 @@ foreach dep: [
required: false) required: false)
optname = 'enable_@0@'.format(dep[0].split('-')[0]) optname = 'enable_@0@'.format(dep[0].split('-')[0])
if d.found() and get_option(optname) != 'disabled' if d.found() and not get_option(optname).disabled()
deps += d deps += d
conf.set('WITH_@0@'.format(dep[0].split('-')[0].to_upper()), '1') conf.set('WITH_@0@'.format(dep[0].split('-')[0].to_upper()), '1')
dep_avail += dep[2] dep_avail += dep[2]
elif get_option(optname) == 'enabled' elif get_option(optname).enabled()
error('@0@ enabled but not found'.format(dep[2])) error('@0@ enabled but not found'.format(dep[2]))
endif endif
endforeach endforeach
......
option('enable_alsa', type: 'feature', description: 'ALSA audio output') option('alsa', type: 'feature', description: 'ALSA audio output')
option('enable_openal', type: 'feature', description: 'OpenAL audio output') option('openal', type: 'feature', description: 'OpenAL audio output')
option('enable_libpulse', type: 'feature', description: 'PulseAudio audio output') option('libpulse', type: 'feature', description: 'PulseAudio audio output')
option('enable_portaudio', type: 'feature', description: 'PortAudio audio output') option('portaudio', type: 'feature', description: 'PortAudio audio output')
option('default_audio_output', type: 'combo', choices: ['auto', 'ALSA', 'OpenAL', 'PulseAudio', 'PortAudio'], description: 'Default audio output') option('default_audio_output', type: 'combo', choices: ['auto', 'ALSA', 'OpenAL', 'PulseAudio', 'PortAudio'], description: 'Default audio output')
option('enable_ffms2', type: 'feature', description: 'FFMS2 video source') option('ffms2', type: 'feature', description: 'FFMS2 video source')
option('enable_fftw3', type: 'feature', description: 'FFTW3 support') option('fftw3', type: 'feature', description: 'FFTW3 support')
option('enable_hunspell', type: 'feature', description: 'Hunspell spell checker') option('hunspell', type: 'feature', description: 'Hunspell spell checker')
option('enable_uchardet', type: 'feature', description: 'uchardet character encoding detection') option('uchardet', type: 'feature', description: 'uchardet character encoding detection')
option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit') option('system_luajit', type: 'boolean', value: false, description: 'Force using system luajit')
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter