From 4ae4d8b071d6ddebc7ce3a16dd7d214dcb16aafd Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Fri, 12 Aug 2022 15:03:47 -0400 Subject: [PATCH] Fixed imgui build --- meson.build | 2 +- server/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index f36e8d14..c55f53d5 100644 --- a/meson.build +++ b/meson.build @@ -101,7 +101,6 @@ if get_option('tracy_fileselector') == 'none' endif threads_dep = dependency('threads') -imgui = dependency('imgui') zstd = dependency('libzstd') includes = [ @@ -201,5 +200,6 @@ tracy_dep_dynamic = declare_dependency( meson.override_dependency('tracy', tracy_dep) +subdir('imgui') subdir('server') subdir('profiler') diff --git a/server/meson.build b/server/meson.build index afa77f69..a31bd662 100644 --- a/server/meson.build +++ b/server/meson.build @@ -52,6 +52,6 @@ server_sources = files( capstone = dependency('capstone') -deps = [imgui, capstone, tracy_dep] +deps = [imgui_dep, capstone, tracy_dep] server_lib = static_library('tracy_server', server_sources, dependencies: deps, cpp_args: '-UTRACY_ENABLE') server_dep = declare_dependency(dependencies: deps, link_with: server_lib) \ No newline at end of file