diff options
| author | Chun-wei Fan <fanc999@yahoo.com.tw> | 2020-02-20 16:53:36 +0000 |
|---|---|---|
| committer | Chun-wei Fan <fanc999@yahoo.com.tw> | 2020-02-20 16:53:36 +0000 |
| commit | 6de5731958a39d47fff14153e970d6e284903ef3 (patch) | |
| tree | 9dc45eab26586dede1d965c0fecf8684fd13fa6d | |
| parent | 1c6e274f5b4ff4a8aa355433691a124983b2ba4a (diff) | |
| parent | f2add079715187471cd47b1fa6a3a67f2bd6633b (diff) | |
| download | atk-6de5731958a39d47fff14153e970d6e284903ef3.tar.gz | |
Merge branch 'msvc.improvements' into 'master'
Visual Studio builds: Use -utf-8 if available (avoid erroring out with C4819 if possible on CJK locales)
See merge request GNOME/atk!38
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 6dab01f..b54ce91 100644 --- a/meson.build +++ b/meson.build @@ -44,7 +44,7 @@ darwin_versions = ['@0@'.format(current + 1), '@0@.@1@'.format(current + 1, atk_ add_project_arguments([ '-DG_DISABLE_SINGLE_INCLUDES', '-DATK_DISABLE_SINGLE_INCLUDES' ], language: 'c') if cc.get_id() == 'msvc' - add_project_arguments([ '-FImsvc_recommended_pragmas.h' ], language: 'c') + add_project_arguments(cc.get_supported_arguments(['-FImsvc_recommended_pragmas.h', '-utf-8']), language: 'c') endif # Compiler and linker flags |