Make use-* aliases for new with-* build options

The 'use-*' variants will be marked as deprecated in a future version.
This commit is contained in:
Robbert van der Helm
2020-06-08 15:59:28 +02:00
parent 9385360331
commit c4842ccda6
7 changed files with 47 additions and 23 deletions
+5 -5
View File
@@ -36,7 +36,7 @@ namespace fs = boost::filesystem;
template <typename... Args>
bp::child launch_host(fs::path host_path, Args&&... args) {
return bp::child(
#ifdef USE_WINEDBG
#ifdef WITH_WINEDBG
// This is set up for KDE Plasma. Other desktop environments and
// window managers require some slight modifications to spawn a
// detached terminal emulator.
@@ -85,7 +85,7 @@ IndividualHost::IndividualHost(boost::asio::io_context& io_context,
plugin_arch(find_vst_architecture(plugin_path)),
host_path(find_vst_host(plugin_arch, false)),
host(launch_host(host_path,
#ifdef USE_WINEDBG
#ifdef WITH_WINEDBG
plugin_path.filename(),
#else
plugin_path,
@@ -94,13 +94,13 @@ IndividualHost::IndividualHost(boost::asio::io_context& io_context,
bp::env = set_wineprefix(),
bp::std_out = stdout_pipe,
bp::std_err = stderr_pipe
#ifdef USE_WINEDBG
#ifdef WITH_WINEDBG
, // winedbg has no reliable way to escape spaces, so
// we'll start the process in the plugin's directory
bp::start_dir = plugin_path.parent_path()
#endif
)) {
#ifdef USE_WINEDBG
#ifdef WITH_WINEDBG
if (plugin_path.string().find(' ') != std::string::npos) {
logger.log("Warning: winedbg does not support paths containing spaces");
}
@@ -135,7 +135,7 @@ GroupHost::GroupHost(
plugin_arch(find_vst_architecture(plugin_path)),
host_path(find_vst_host(plugin_arch, true)),
host_vst_dispatch(host_vst_dispatch) {
#ifdef USE_WINEDBG
#ifdef WITH_WINEDBG
if (plugin_path.string().find(' ') != std::string::npos) {
logger.log("Warning: winedbg does not support paths containing spaces");
}
+4 -4
View File
@@ -78,7 +78,7 @@ PluginBridge::PluginBridge(audioMasterCallback host_callback)
wine_io_handler([&]() { io_context.run(); }) {
log_init_message();
#ifndef USE_WINEDBG
#ifndef WITH_WINEDBG
// If the Wine process fails to start, then nothing will connect to the
// sockets and we'll be hanging here indefinitely. To prevent this, we'll
// periodically poll whether the Wine process is still running, and throw
@@ -622,13 +622,13 @@ void PluginBridge::log_init_message() {
// Include a list of enabled compile-tiem features, mostly to make debug
// logs more useful
init_msg << "Enabled features:" << std::endl;
#ifdef USE_BITBRIDGE
#ifdef WITH_BITBRIDGE
init_msg << "- bitbridge support" << std::endl;
#endif
#ifdef USE_WINEDBG
#ifdef WITH_WINEDBG
init_msg << "- winedbg" << std::endl;
#endif
#if !(defined(USE_BITBRIDGE) || defined(USE_WINEDBG))
#if !(defined(WITH_BITBRIDGE) || defined(WITH_WINEDBG))
init_msg << " <none>" << std::endl;
#endif
init_msg << std::endl;