diff options
| author | Akira TAGOH <akira@tagoh.org> | 2024-04-10 12:30:15 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2024-04-10 12:34:46 +0900 |
| commit | 162326d84ec9e99e770c4b9674572655ff6a7ec7 (patch) | |
| tree | d32883ca46dd3a0492c7bfa1d23d3a6c4bc0d426 | |
| parent | e503eae0f935007ad2ed97102854627c503b24a0 (diff) | |
meson: Use c_shared_args to take care of --default-library=both on Win32
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 8d7a6e1..f358227 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('fontconfig', 'c', version: '2.15.0', - meson_version : '>= 0.60.0', + meson_version : '>= 1.3.0', default_options: [ 'buildtype=debugoptimized'], ) diff --git a/src/meson.build b/src/meson.build index 63c7340..c994f92 100644 --- a/src/meson.build +++ b/src/meson.build @@ -55,16 +55,16 @@ fcobjshash_h = custom_target('fcobjshash.h', ) # Define FcPublic appropriately for exports on windows -fc_extra_c_args = [] +fc_c_shared_args = [] -if host_machine.system() == 'windows' and get_option('default_library') == 'shared' - fc_extra_c_args += '-DFcPublic=__declspec(dllexport)' - fc_extra_c_args += '-DDLL_EXPORT' +if host_machine.system() == 'windows' and get_option('default_library') in ['both', 'shared'] + fc_c_shared_args += '-DFcPublic=__declspec(dllexport)' + fc_c_shared_args += '-DDLL_EXPORT' endif libfontconfig = library('fontconfig', fc_sources, alias_headers, ft_alias_headers, fclang_h, fccase_h, fcobjshash_h, - c_args: c_args + fc_extra_c_args, + c_shared_args: fc_c_shared_args, include_directories: incbase, dependencies: [deps, math_dep], install: true, |