From 8d82bd4286619f64ea3cdef2f151630700c1d47a Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler@tylermayoff.com>
Date: Fri, 12 Aug 2022 15:00:03 -0400
Subject: [PATCH] Fixed build

---
 .gitignore           | 4 ++++
 meson.build          | 2 +-
 profiler/meson.build | 2 +-
 server/meson.build   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 40921279..cb927dc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,7 @@ extra/vswhere.exe
 extra/tracy-build
 /.cache
 compile_commands.json
+
+subprojects/*
+!subprojects/imgui.wrap
+!subprojects/zstd.wrap
\ No newline at end of file
diff --git a/meson.build b/meson.build
index 03b952bc..f36e8d14 100644
--- a/meson.build
+++ b/meson.build
@@ -102,7 +102,7 @@ endif
 
 threads_dep = dependency('threads')
 imgui = dependency('imgui')
-zstd = dependency('zstd')
+zstd = dependency('libzstd')
 
 includes = [
     'public/tracy/TracyC.h',
diff --git a/profiler/meson.build b/profiler/meson.build
index 0c9d5cdc..a9ef1f0b 100644
--- a/profiler/meson.build
+++ b/profiler/meson.build
@@ -13,7 +13,7 @@ profiler_sources = files(
     'src/imgui/imgui_impl_opengl3.cpp')
 
 glfw = dependency('glfw3')
-deps = [glfw, threads_dep, server_dep, tracy_dep, zstd_dep]
+deps = [glfw, threads_dep, server_dep, tracy_dep, zstd]
 
 if get_option('tracy_fileselector') == 'gtk'
     profiler_sources += files('../nfd/nfd_gtk.cpp')
diff --git a/server/meson.build b/server/meson.build
index a31bd662..afa77f69 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -52,6 +52,6 @@ server_sources = files(
 
 capstone = dependency('capstone')
 
-deps = [imgui_dep, capstone, tracy_dep]
+deps = [imgui, 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