mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-04-21 21:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only specify static iconv on Windows

Browse source
This commit is contained in:
Roza 2021-06-26 15:39:59 -04:00
parent 6f098aeb15
commit a38701df85
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/meson.build
View file

@ -12,13 +12,16 @@ pixman = dependency('pixman-1', static: build_static)
png = dependency('libpng', static: build_static) png = dependency('libpng', static: build_static)
jpeg = dependency('libjpeg', static: build_static) jpeg = dependency('libjpeg', static: build_static)
zlib = dependency('zlib', static: build_static) zlib = dependency('zlib', static: build_static)
iconv = compilers['cpp'].find_library('iconv')
uchardet = dependency('uchardet', static: build_static) uchardet = dependency('uchardet', static: build_static)
if host_system == 'windows' if host_system == 'windows'
bz2 = dependency('bzip2', static: build_static) bz2 = dependency('bzip2', static: build_static)
iconv = compilers['cpp'].find_library('iconv', static: build_static)
else else
bz2 = compilers['cpp'].find_library('bz2') 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') global_dependencies += compilers['cpp'].find_library('charset')
endif endif