diff --git a/CHANGELOG.md b/CHANGELOG.md index 743b4d97..76e11e6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,12 @@ Versioning](https://semver.org/spec/v2.0.0.html). [readme](https://github.com/robbert-vdh/yabridge/tree/feature/cli-tools/tools/yabridgectl/README.md) for more information on how it works. +### Deprecated + +- The `use-bitbridge` and `use-winedbg` options have been deprecated in favour + of the new `with-bitbridge` and `with-winedbg` options. The old options will + continue to work until they are removed in yabridge 2.0.0. + ## [1.2.1] - 2020-06-20 ### Changed diff --git a/meson.build b/meson.build index f12edf6a..b546a548 100644 --- a/meson.build +++ b/meson.build @@ -31,11 +31,23 @@ group_host_name_32bit = 'yabridge-group-32' # https://github.com/boostorg/asio/issues/312 compiler_options = ['-DBOOST_ASIO_DISABLE_CONCEPTS'] -# TODO: Mark the `use-` versions of these options as deprecated in the next -# minor version -with_bitbridge = get_option('use-bitbridge') or get_option('with-bitbridge') +with_bitbridge = get_option('with-bitbridge') with_static_boost = get_option('with-static-boost') -with_winedbg = get_option('use-winedbg') or get_option('with-winedbg') +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'