vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-07 03:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent building tomlplusplus libs in subproject

Browse Source 
This is supposed to be disabled by default, but it isn't.
This commit is contained in:
Robbert van der Helm
2023-02-21 14:42:24 +01:00
parent e937bfb2dc
commit 4ea0530a37
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+1 -1
View File
@@ -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') ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0')
threads_dep = dependency('threads') threads_dep = dependency('threads')
# Tomlplusplus recently added a shraed library version. We don't want to link to that. # 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') dl_dep = declare_dependency(link_args : '-ldl')
rt_dep = declare_dependency(link_args : '-lrt') rt_dep = declare_dependency(link_args : '-lrt')
src/common/configuration.cpp
-9
View File
@@ -33,34 +33,25 @@
// errors and we don't need them so we'll just disable them outright. Disabling // 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_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`. // `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("_WIN32")
#pragma push_macro("__WIN32__") #pragma push_macro("__WIN32__")
#pragma push_macro("__NT__") #pragma push_macro("__NT__")
#pragma push_macro("__CYGWIN__") #pragma push_macro("__CYGWIN__")
#undef WIN32 #undef WIN32
#undef _WIN32 #undef _WIN32
#undef __WIN32__ #undef __WIN32__
#undef __NT__ #undef __NT__
#undef __CYGWIN__ #undef __CYGWIN__
#endif
#include <toml++/toml.h> #include <toml++/toml.h>
#ifdef __WINE__
#pragma pop_macro("WIN32") #pragma pop_macro("WIN32")
#pragma pop_macro("_WIN32") #pragma pop_macro("_WIN32")
#pragma pop_macro("__WIN32__") #pragma pop_macro("__WIN32__")
#pragma pop_macro("__NT__") #pragma pop_macro("__NT__")
#pragma pop_macro("__CYGWIN__") #pragma pop_macro("__CYGWIN__")
#endif
#include "utils.h" #include "utils.h"
namespace fs = ghc::filesystem; namespace fs = ghc::filesystem;