mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 15:19:07 +08:00
e0c3408c77
* [tracy] Add Tracy `profiler` and `capture` tools * [tracy] Linux supports * [capstone] fix non-installed pkg-config * [tracy] supports for capstone (including pkgconfig support) * [tracy] Add license * [tracy] fix OSX * [tracy] tools cannot be built on x86 Windows * [tracy] do not build tools by default * [tracy] Fix case * [tracy] fix vcpkg copyright location convention * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Finish code for code review suggestions * Use `vcpkg_build_make` instead of `vcpkg_execute_build_process` * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Workaround Windows cl complaint about `nodiscard` * Use tools bundle rather than individual tools in features * [capstone] Upgrade port after capstone-engine/capstone#1870 merge Co-authored-by: MACHIZAUD Andréa <andrea.machizaud@adobe.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
27 lines
668 B
Diff
27 lines
668 B
Diff
diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp
|
|
index cc56298..7b9370a 100644
|
|
--- a/server/TracySourceView.cpp
|
|
+++ b/server/TracySourceView.cpp
|
|
@@ -2,7 +2,7 @@
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
|
|
-#include <capstone.h>
|
|
+#include <capstone/capstone.h>
|
|
|
|
#include "imgui.h"
|
|
#include "TracyCharUtil.hpp"
|
|
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
|
|
index fcb1718..2433e59 100644
|
|
--- a/server/TracyWorker.cpp
|
|
+++ b/server/TracyWorker.cpp
|
|
@@ -19,7 +19,7 @@
|
|
#include <inttypes.h>
|
|
#include <sys/stat.h>
|
|
|
|
-#include <capstone.h>
|
|
+#include <capstone/capstone.h>
|
|
|
|
#define ZDICT_STATIC_LINKING_ONLY
|
|
#include "../zstd/zdict.h"
|