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

Update imgui to 1.81 + docking.

Browse Source
This commit is contained in:
Bartosz Taudul
2021-02-11 00:30:41 +01:00
parent 26a8ec3909
commit f0e1d77ebc
20 changed files with 1099 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/build/unix/build.mk
+1 -1
View File
@@ -1,6 +1,6 @@
CFLAGS +=
CXXFLAGS := $(CFLAGS) -std=c++17
DEFINES += -DIMGUI_IMPL_OPENGL_LOADER_GL3W
DEFINES += -DIMGUI_IMPL_OPENGL_LOADER_GL3W -DIMGUI_ENABLE_FREETYPE
INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -I../../libs/gl3w
LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl
profiler/build/win32/Tracy.vcxproj
+4 -4
View File
@@ -56,7 +56,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\libs\gl3w;..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgCurrentInstalledDir)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
@@ -82,7 +82,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\libs\gl3w;..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgCurrentInstalledDir)\include\capstone;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ConformanceMode>true</ConformanceMode>
@@ -112,6 +112,7 @@
<ClCompile Include="..\..\..\imgui\imgui_draw.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_tables.cpp" />
<ClCompile Include="..\..\..\imgui\imgui_widgets.cpp" />
<ClCompile Include="..\..\..\imgui\misc\freetype\imgui_freetype.cpp" />
<ClCompile Include="..\..\..\nfd\nfd_common.c" />
<ClCompile Include="..\..\..\nfd\nfd_win.cpp" />
<ClCompile Include="..\..\..\server\TracyBadVersion.cpp" />
@@ -159,7 +160,6 @@
<ClCompile Include="..\..\..\zstd\zstd_opt.c" />
<ClCompile Include="..\..\libs\gl3w\GL\gl3w.c" />
<ClCompile Include="..\..\src\HttpRequest.cpp" />
<ClCompile Include="..\..\src\imgui_freetype.cpp" />
<ClCompile Include="..\..\src\imgui_impl_glfw.cpp" />
<ClCompile Include="..\..\src\imgui_impl_opengl3.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
@@ -187,6 +187,7 @@
<ClInclude Include="..\..\..\imgui\imstb_rectpack.h" />
<ClInclude Include="..\..\..\imgui\imstb_textedit.h" />
<ClInclude Include="..\..\..\imgui\imstb_truetype.h" />
<ClInclude Include="..\..\..\imgui\misc\freetype\imgui_freetype.h" />
<ClInclude Include="..\..\..\nfd\common.h" />
<ClInclude Include="..\..\..\nfd\nfd.h" />
<ClInclude Include="..\..\..\nfd\nfd_common.h" />
@@ -267,7 +268,6 @@
<ClInclude Include="..\..\src\FontAwesomeSolid.hpp" />
<ClInclude Include="..\..\src\HttpRequest.hpp" />
<ClInclude Include="..\..\src\icon.hpp" />
<ClInclude Include="..\..\src\imgui_freetype.h" />
<ClInclude Include="..\..\src\imgui_impl_glfw.h" />
<ClInclude Include="..\..\src\imgui_impl_opengl3.h" />
<ClInclude Include="..\..\src\NativeWindow.hpp" />
profiler/build/win32/Tracy.vcxproj.filters
+9 -6
View File
@@ -22,6 +22,9 @@
<Filter Include="zstd">
<UniqueIdentifier>{c67291b2-9e67-4915-b80f-6891ceb683a3}</UniqueIdentifier>
</Filter>
<Filter Include="imgui\freetype">
<UniqueIdentifier>{1a9a9fea-82b2-41df-9d0e-ef4b00ed1213}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\common\tracy_lz4.cpp">
@@ -60,9 +63,6 @@
<ClCompile Include="..\..\..\server\TracyBadVersion.cpp">
<Filter>server</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui_freetype.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\src\winmain.cpp">
<Filter>src</Filter>
</ClCompile>
@@ -216,6 +216,9 @@
<ClCompile Include="..\..\..\imgui\imgui_tables.cpp">
<Filter>imgui</Filter>
</ClCompile>
<ClCompile Include="..\..\..\imgui\misc\freetype\imgui_freetype.cpp">
<Filter>imgui\freetype</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -323,9 +326,6 @@
<ClInclude Include="..\..\src\Cousine.hpp">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui_freetype.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\server\TracyBuzzAnim.hpp">
<Filter>server</Filter>
</ClInclude>
@@ -521,6 +521,9 @@
<ClInclude Include="..\..\..\server\TracySortedVector.hpp">
<Filter>server</Filter>
</ClInclude>
<ClInclude Include="..\..\..\imgui\misc\freetype\imgui_freetype.h">
<Filter>imgui\freetype</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />