diff --git a/NEWS b/NEWS index 6a8bee49..23665d4f 100644 --- a/NEWS +++ b/NEWS @@ -75,6 +75,10 @@ vx.xx.x (xxxx-xx-xx) ignores global constructors that have side effects. - ZoneText and ZoneName macros now have a printf-like variant, denoted with a 'F' postfix. +- The 'tracy_shared_libs' Meson option was removed. Use interface provided + by Meson to set the library type instead. +- Dropped the 'tracy_' prefix from Meson options. The `tracy_enable` option + remains as it was, as it can be inherited from parent projects. v0.10.0 (2023-10-16) diff --git a/meson.build b/meson.build index 5db46b5a..c4b8fe16 100644 --- a/meson.build +++ b/meson.build @@ -120,9 +120,6 @@ if get_option('debuginfod') endif tracy_shared_libs = get_option('default_library') == 'shared' -if not tracy_shared_libs and get_option('shared_libs') - warning('tracy_shared_libs is set to true, but default_library is set to static. Building static library.') -endif if tracy_shared_libs tracy_compile_args += ['-DTRACY_EXPORTS'] diff --git a/meson.options b/meson.options index 4b9a1a5e..938aef38 100644 --- a/meson.options +++ b/meson.options @@ -22,7 +22,6 @@ option('libbacktrace_elf_dynload_support', type : 'boolean', value : false, desc option('delayed_init', type : 'boolean', value : false, description : 'Enable delayed initialization of the library (init on first call)') option('manual_lifetime', type : 'boolean', value : false, description : 'Enable the manual lifetime management of the profile') option('fibers', type : 'boolean', value : false, description : 'Enable fibers support') -option('shared_libs', type : 'boolean', value : false, description : 'Builds Tracy as a shared object (deprecated in favour of default_library=shared)', deprecated : true) option('no_crash_handler', type : 'boolean', value : false, description : 'Disable crash handling') option('verbose', type : 'boolean', value : false, description : 'Enable verbose logging') option('debuginfod', type : 'boolean', value : false, description : 'Enable debuginfod support') \ No newline at end of file