zhangengru/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00
Code Issues Projects Wiki Activity

Merge remote-tracking branch 'origin/master' into hw

Browse Source
This commit is contained in:
Bartosz Taudul
2021-06-02 01:12:28 +02:00
parent 688a9722c7 f4d80a4f5f
commit b7c5939bb8
21 changed files with 112 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/build/win32/Tracy.vcxproj
+1 -1
View File
@@ -186,6 +186,7 @@
<ClInclude Include="..\..\..\common\TracySocket.hpp" />
<ClInclude Include="..\..\..\common\TracyStackFrames.hpp" />
<ClInclude Include="..\..\..\common\TracySystem.hpp" />
<ClInclude Include="..\..\..\common\TracyYield.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4.hpp" />
<ClInclude Include="..\..\..\common\tracy_lz4hc.hpp" />
<ClInclude Include="..\..\..\imgui\imconfig.h" />
@@ -236,7 +237,6 @@
<ClInclude Include="..\..\..\server\TracyView.hpp" />
<ClInclude Include="..\..\..\server\TracyViewData.hpp" />
<ClInclude Include="..\..\..\server\TracyWorker.hpp" />
<ClInclude Include="..\..\..\server\TracyYield.hpp" />
<ClInclude Include="..\..\..\server\tracy_pdqsort.h" />
<ClInclude Include="..\..\..\server\tracy_robin_hood.h" />
<ClInclude Include="..\..\..\server\tracy_xxh3.h" />
profiler/build/win32/Tracy.vcxproj.filters
+3 -3
View File
@@ -425,9 +425,6 @@
<ClInclude Include="..\..\..\server\tracy_xxh3.h">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\TracyYield.hpp">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\TracySort.hpp">
<Filter>server</Filter>
</ClInclude>
@@ -578,6 +575,9 @@
<ClInclude Include="..\..\..\common\TracyStackFrames.hpp">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\..\..\common\TracyYield.hpp">
<Filter>common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />