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

meson: use check_header to check for iconv

iconv is not a standalone library on Linux, so find_library is pointless
parent 255a9fc8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -50,13 +50,10 @@ cxx = meson.get_compiler('cpp')
cc = meson.get_compiler('c')
deps += cc.find_library('m', required: false)
deps += cc.find_library('dl', required: false)
iconv_dep = cc.find_library('iconv', required: false)
if not iconv_dep.found() and host_machine.system() == 'windows'
if not cxx.check_header('iconv.h')
iconv_sp = subproject('iconv') # this really needs to be replaced with a proper port
deps_inc += iconv_sp.get_variable('iconv_incs')
iconv_dep = iconv_sp.get_variable('libiconv_dep')
deps += iconv_sp.get_variable('libiconv_dep')
endif
deps += iconv_dep
deps += dependency('libass', version: '>=0.9.7',
fallback: ['libass', 'libass_dep'])
......
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