summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2020-06-18 11:34:39 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2020-06-18 14:31:29 +0800
commitdfa750203deb26f57fc1d2024366bd9fbd17ad76 (patch)
treeae1dcf1c5be0dc1290118435c5ba79dc15d90710 /tools
parent2db1529957783a4f141892586a4d6a6528665a1f (diff)
downloadglibmm-dfa750203deb26f57fc1d2024366bd9fbd17ad76.tar.gz
Meson/Visual Studio builds: Include toolset version by default
This makes the built DLL and .lib's contain the toolset version if the build is carried out using Visual Studio 2017 or later, unless the 'msvc14x-parallel-installable' option is set to be false during configuration. The reasoning behind this change is that there are subtle problems when, for instance, one tries to link to a Visual Studio 2017-built glibmm when building gtkmm and libxml++ with Visual Studio 2019. This is unfortunate as Microsoft did try hard to make interoperating between binaries built with Visual Studio 2015, 2017 and 2019 as easy as possible in terms of ABI and API, but unfortunately this hits the corner cases where this compatibility does not work. As the name suggests, this attempts to make Visual Studio 2017 and 2019 builds share a single set of underlying C DLLs easier, while avoiding breakages caused by such subtle differences.
Diffstat (limited to 'tools')
-rw-r--r--tools/extra_defs_gen/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index 65b56e96..5080b7d5 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/meson.build
@@ -1,11 +1,11 @@
# tools/extra_defs_gen
# Input: glibmm_build_dep, giomm_build_dep, glibmm_api_version,
-# glibmm_libversion, glibmm_pcname
+# glibmm_libversion, glibmm_pcname, msvc14x_toolset_ver
# Output: -
glibmm_generate_extra_defs_library = library(
- 'glibmm_generate_extra_defs-' + glibmm_api_version,
+ 'glibmm_generate_extra_defs' + msvc14x_toolset_ver + '-' + glibmm_api_version,
'generate_extra_defs.cc',
version: glibmm_libversion,
cpp_args: '-DGLIBMM_GEN_EXTRA_DEFS_BUILD',