diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-01-14 16:59:45 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2020-01-15 11:02:48 +0800 |
commit | ad937bca10be979cc468b8da0d31f40f86ce0851 (patch) | |
tree | 32039d6ea9b00ff35ffe20ab10c837b7dfbde7ce /gir | |
parent | fbc3657b769bfa156927a6a116d5967d58b5e75e (diff) | |
download | gobject-introspection-ad937bca10be979cc468b8da0d31f40f86ce0851.tar.gz |
Visual Studio builds: Use -utf-8 where available
This avoids compilation erroring out on C4819 (Unicode handling issue in the
Visual Studio compiler), notably when running on Chinese, Japanese and Korean
(CJK) locales.
This also applies -utf-8 into the cflags passed into the various g-ir-scanner
command lines that are used to generate the *.gir files, where -utf-8 is
available, so that we don't get flooded with C4819 warnings during the
build, and therefore avoid potential mishaps, as C4819 is a real warning that
warngs us the code may be incorrectly built.
Diffstat (limited to 'gir')
-rw-r--r-- | gir/meson.build | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gir/meson.build b/gir/meson.build index 4ee224c7..a0b96cfd 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -196,7 +196,7 @@ glib_gir = custom_target('gir-glib', install: true, install_dir: girdir, command: glib_command + [ - '--cflags-begin'] + glib_includes + [ + '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ '-DGLIB_COMPILATION', '-D__G_I18N_LIB_H__', '-DGETTEXT_PACKAGE=Dummy', @@ -260,7 +260,7 @@ gobject_gir = custom_target('gir-gobject', install_dir: girdir, command: gobject_command + [ '--include-uninstalled=' + glib_gir.full_path(), - '--cflags-begin'] + glib_includes + [ + '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ '-DGOBJECT_COMPILATION', '--cflags-end', '@INPUT@', @@ -307,7 +307,7 @@ gir_files += custom_target('gir-gmodule', install_dir: girdir, command: gmodule_command + [ '--include-uninstalled=' + glib_gir.full_path(), - '--cflags-begin'] + glib_includes + [ + '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ '--cflags-end', '@INPUT@', ] @@ -396,7 +396,7 @@ gio_gir = custom_target('gir-gio', install_dir: girdir, command: gio_command + [ '--include-uninstalled=' + gobject_gir.full_path(), - '--cflags-begin'] + glib_includes + [ + '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ '-DGIO_COMPILATION', '-DG_SETTINGS_ENABLE_BACKEND', '--cflags-end', @@ -433,7 +433,7 @@ gir_files += custom_target('gir-girepository', install_dir: girdir, command: girepository_command + [ '--include-uninstalled=' + gobject_gir.full_path(), - '--cflags-begin'] + glib_includes + [ + '--cflags-begin'] + glib_includes + extra_giscanner_cflags + [ '-I' + meson.current_source_dir() + '/../girepository', '-I' + meson.current_build_dir() + '/../girepository', '-DGI_COMPILATION', |