From f1b1f20fdb2c3fd018e1dd06704f0a5cca83eb90 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Sun, 27 Sep 2020 17:48:43 +0200 Subject: [PATCH] Update tomlplusplus --- meson.build | 2 +- src/common/configuration.cpp | 4 ++++ subprojects/tomlplusplus.wrap | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 318aa339..b40c8b39 100644 --- a/meson.build +++ b/meson.build @@ -74,7 +74,7 @@ boost_filesystem_dep = dependency( ) bitsery_dep = subproject('bitsery').get_variable('bitsery_dep') threads_dep = dependency('threads') -tomlplusplus_dep = subproject('tomlplusplus').get_variable('tomlplusplus_dep') +tomlplusplus_dep = subproject('tomlplusplus', version : '2.1.0').get_variable('tomlplusplus_dep') # The built in threads dependency does not know how to handle winegcc wine_threads_dep = declare_dependency(link_args : '-lpthread') xcb_dep = dependency('xcb') diff --git a/src/common/configuration.cpp b/src/common/configuration.cpp index 208f893b..813f4470 100644 --- a/src/common/configuration.cpp +++ b/src/common/configuration.cpp @@ -16,6 +16,10 @@ #include "configuration.h" +// tomlplusplus recently got some Windows fixes, but they cause compilation +// errors and we don't need them so we'll just disable them outright +#define TOML_WINDOWS_COMPAT 0 + #include #include #include diff --git a/subprojects/tomlplusplus.wrap b/subprojects/tomlplusplus.wrap index 15bb40d5..b5d94551 100644 --- a/subprojects/tomlplusplus.wrap +++ b/subprojects/tomlplusplus.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://github.com/marzer/tomlplusplus.git -revision = v1.2.5 +revision = v2.1.0 depth = 1