summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2018-05-28 10:22:00 +0000
committerPhilip Withnall <philip@tecnocode.co.uk>2018-05-28 10:22:00 +0000
commit0c624379aa44aacbcb78f65cdc358d832a7c64f1 (patch)
tree77806d7231682b49b331aa7db6b9d505f252f448
parenta431f4fe3e670587111ab877e4dc762a03a599e5 (diff)
parent947b585ca637409bfc5400f8307535d23b7d1f6d (diff)
downloadglib-0c624379aa44aacbcb78f65cdc358d832a7c64f1.tar.gz
Merge branch 'msvc-force-codeset' into 'master'
msvc: set the execution and source encoding to utf-8. Fixes #1294 Closes #1294 See merge request GNOME/glib!25
-rw-r--r--meson.build2
1 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build
index 62989bedd..d173d57bf 100644
--- a/meson.build
+++ b/meson.build
@@ -23,6 +23,8 @@ if cc.get_id() == 'msvc'
# Disable SAFESEH with MSVC for plugins and libs that use external deps that
# are built with MinGW
noseh_link_args = ['/SAFESEH:NO']
+ # Set the input and exec encoding to utf-8, like is the default with GCC
+ add_project_arguments(cc.get_supported_arguments(['/utf-8']), language: 'c')
else
noseh_link_args = []
# -mms-bitfields vs -fnative-struct ?