diff --git a/CHANGELOG.md b/CHANGELOG.md index 712cc075..9f072349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,9 @@ Versioning](https://semver.org/spec/v2.0.0.html). ### Removed - The `hack_reaper_update_display` option is now obsolete and has been removed. +- The previously deprecated `use-bitbridge` and `use-winedbg` compilation + options have been removed. Please use `with-bitbridge` and `with-winedbg` + instead. TODO: Remove all mentions of `hack_reaper_update_display` from the readme. diff --git a/meson.build b/meson.build index b0eae740..03b4f921 100644 --- a/meson.build +++ b/meson.build @@ -15,13 +15,12 @@ if not meson.get_compiler('cpp').compiles(winelib_check) error('You need to set up a cross compiler, check the README for compilation instructions.') endif -# Depending on the `use-bitbridge` flag we'll enable building secondary 32-bit -# host applications that can act as a bit bridge for using 32-bit Windows plugins -# in 64-bit Linux VST hosts. The plugin will determine which host application to -# use based on the `.dll` file it's trying to load. -# This setup is necessary until Meson provides a way to have multiple -# cross-builds for a single build directory: -# https://github.com/mesonbuild/meson/issues/5125 +# Depending on the `with-bitbridge` flag we'll enable building secondary 32-bit +# host applications that can act as a bit bridge for using 32-bit Windows +# plugins in 64-bit Linux VST hosts. The plugin will determine which host +# application to use based on the `.dll` file it's trying to load. This setup is +# necessary until Meson provides a way to have multiple cross-builds for a +# single build directory: https://github.com/mesonbuild/meson/issues/5125 individual_host_name_64bit = 'yabridge-host' individual_host_name_32bit = 'yabridge-host-32' group_host_name_64bit = 'yabridge-group' @@ -35,20 +34,6 @@ with_bitbridge = get_option('with-bitbridge') with_static_boost = get_option('with-static-boost') with_winedbg = get_option('with-winedbg') -# TODO: Remove the `use-*` versions of these options in yabridge 2.0.0 -if not with_bitbridge and get_option('use-bitbridge') - with_bitbridge = true - warning('''The 'use-bitbridge' option has been deprecated and will be ''' + - '''removed in yabridge 2.0.0, use the 'with-bitbridge' option ''' + - '''instead.''') -endif -if not with_winedbg and get_option('use-winedbg') - with_winedbg = true - warning('''The 'use-winedbg' option has been deprecated and will be ''' + - '''removed in yabridge 2.0.0, use the 'with-winedbg' option ''' + - '''instead.''') -endif - if with_bitbridge compiler_options += '-DWITH_BITBRIDGE' endif diff --git a/meson_options.txt b/meson_options.txt index f596c615..bca9126c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,12 +1,3 @@ -# TODO: Remove the `use-*` variants of these options in yabridge 2.0.0 - -option( - 'use-bitbridge', - type : 'boolean', - value : false, - description : 'Alias for `with-bitbridge`, will be marked as deprecated in the next minor version.' -) - option( 'with-bitbridge', type : 'boolean', @@ -21,13 +12,6 @@ option( description : 'Enable static linking for Boost. Needed when distributing the binaries to other systems.' ) -option( - 'use-winedbg', - type : 'boolean', - value : false, - description : 'Alias for `with-winedbg`, will be marked as deprecated in the next minor version.' -) - option( 'with-winedbg', type : 'boolean', diff --git a/src/plugin/host-process.cpp b/src/plugin/host-process.cpp index c40ae364..930209f8 100644 --- a/src/plugin/host-process.cpp +++ b/src/plugin/host-process.cpp @@ -35,7 +35,7 @@ bool pid_running(pid_t pid); /** * Simple helper function around `boost::process::child` that launches the host * application (`*.exe`) wrapped in winedbg if compiling with - * `-Duse-winedbg=true`. Keep in mind that winedbg does not handle arguments + * `-Dwith-winedbg=true`. Keep in mind that winedbg does not handle arguments * containing spaces, so most Windows paths will be split up into multiple * arugments. */