From fa1f55ccb2943539bf5f97ee476f0e3cbfa26ac6 Mon Sep 17 00:00:00 2001 From: Struma Date: Sat, 26 Jun 2021 15:39:59 -0400 Subject: [PATCH] Only specify static iconv on Windows --- src/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 588ef285..8f75bb18 100755 --- a/src/meson.build +++ b/src/meson.build @@ -12,13 +12,16 @@ pixman = dependency('pixman-1', static: build_static) png = dependency('libpng', static: build_static) jpeg = dependency('libjpeg', static: build_static) zlib = dependency('zlib', static: build_static) -iconv = compilers['cpp'].find_library('iconv') uchardet = dependency('uchardet', static: build_static) if host_system == 'windows' bz2 = dependency('bzip2', static: build_static) + iconv = compilers['cpp'].find_library('iconv', static: build_static) else bz2 = compilers['cpp'].find_library('bz2') + # FIXME: Specifically asking for static doesn't work if iconv isn't + # installed in the system prefix somewhere + iconv = compilers['cpp'].find_library('iconv') global_dependencies += compilers['cpp'].find_library('charset') endif