mirror of
https://github.com/robbert-vdh/yabridge.git
synced 2026-05-06 19:40:10 +02:00
Prevent building tomlplusplus libs in subproject
This is supposed to be disabled by default, but it isn't.
This commit is contained in:
+1
-1
@@ -266,7 +266,7 @@ function2_dep = dependency('function2', version : '>=4.0.0')
|
||||
ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0')
|
||||
threads_dep = dependency('threads')
|
||||
# Tomlplusplus recently added a shraed library version. We don't want to link to that.
|
||||
tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.3.0').partial_dependency(compile_args : true, includes : true)
|
||||
tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.3.0', default_options : ['compile_library=false']).partial_dependency(compile_args : true, includes : true)
|
||||
|
||||
dl_dep = declare_dependency(link_args : '-ldl')
|
||||
rt_dep = declare_dependency(link_args : '-lrt')
|
||||
|
||||
@@ -33,34 +33,25 @@
|
||||
// errors and we don't need them so we'll just disable them outright. Disabling
|
||||
// `TOML_ENABLE_WINDOWS_COMPAT` is no longer enough, and you can't disable
|
||||
// `TOML_WINDOWS` directly. This is the same trick used in `use-asio-linux.h`.
|
||||
#ifdef __WINE__
|
||||
|
||||
#pragma push_macro("WIN32")
|
||||
#pragma push_macro("_WIN32")
|
||||
#pragma push_macro("__WIN32__")
|
||||
#pragma push_macro("__NT__")
|
||||
#pragma push_macro("__CYGWIN__")
|
||||
|
||||
#undef WIN32
|
||||
#undef _WIN32
|
||||
#undef __WIN32__
|
||||
#undef __NT__
|
||||
#undef __CYGWIN__
|
||||
|
||||
#endif
|
||||
|
||||
#include <toml++/toml.h>
|
||||
|
||||
#ifdef __WINE__
|
||||
|
||||
#pragma pop_macro("WIN32")
|
||||
#pragma pop_macro("_WIN32")
|
||||
#pragma pop_macro("__WIN32__")
|
||||
#pragma pop_macro("__NT__")
|
||||
#pragma pop_macro("__CYGWIN__")
|
||||
|
||||
#endif
|
||||
|
||||
#include "utils.h"
|
||||
|
||||
namespace fs = ghc::filesystem;
|
||||
|
||||
Reference in New Issue
Block a user