[glibmm/glibmm-2-64: 2/2] Merge branch 'meson-msvc-toolset-2-64' into 'glibmm-2-64'

[Chun-wei Fan <fanchunwei src gnome org>]

commit 4765f0fc824c805b7394cba3cbe43bda8c424f44
Merge: 9f5e00ff 0ac07ab6
Author: Chun-wei Fan <fanc999 yahoo com tw>
Date:   Wed Jun 24 17:02:18 2020 +0000

    Merge branch 'meson-msvc-toolset-2-64' into 'glibmm-2-64'
    
    Meson/Visual Studio builds: Include toolset version by default (glibmm-2-64 branch)
    
    See merge request GNOME/glibmm!36

 README.win32                     |  6 +++++-
 configure.ac                     |  1 +
 gio/giomm-uninstalled.pc.in      |  2 +-
 gio/giomm.pc.in                  |  2 +-
 gio/giomm/meson.build            |  6 +++---
 glib/glibmm-uninstalled.pc.in    |  2 +-
 glib/glibmm.pc.in                |  2 +-
 glib/glibmm/meson.build          |  6 +++---
 glib/meson.build                 |  3 ++-
 meson.build                      | 20 ++++++++++++++++++++
 meson_options.txt                |  2 ++
 tools/extra_defs_gen/meson.build |  4 ++--
 12 files changed, 42 insertions(+), 14 deletions(-)
---