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

Use freetype to render fonts.

Browse Source
This commit is contained in:
Bartosz Taudul
2018-08-17 21:40:15 +02:00
parent e6ab7692c8
commit 914a1713e3
8 changed files with 446 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
profiler/build/unix/build.mk
+2 -2
View File
@@ -1,8 +1,8 @@
CFLAGS +=
CXXFLAGS := $(CFLAGS) -std=c++17
DEFINES += -DTRACY_FILESELECTOR -DTRACY_EXTENDED_FONT -DTRACY_ROOT_WINDOW
INCLUDES := $(shell pkg-config --cflags glfw3) -I../../../imgui -I../../libs/gl3w
LIBS := $(shell pkg-config --libs glfw3) -lpthread -ldl
INCLUDES := $(shell pkg-config --cflags glfw3 freetype2) -I../../../imgui -I../../libs/gl3w
LIBS := $(shell pkg-config --libs glfw3 freetype2) -lpthread -ldl
PROJECT := Tracy
IMAGE := $(PROJECT)-$(BUILD)
profiler/build/win32/Tracy.vcxproj
+14
View File
@@ -107,6 +107,7 @@
<ClCompile Include="..\..\..\server\TracyView.cpp" />
<ClCompile Include="..\..\..\server\TracyWorker.cpp" />
<ClCompile Include="..\..\libs\gl3w\GL\gl3w.c" />
<ClCompile Include="..\..\src\imgui_freetype.cpp" />
<ClCompile Include="..\..\src\imgui_impl_glfw_gl3.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
</ItemGroup>
@@ -156,12 +157,25 @@
<ClInclude Include="..\..\src\Arimo.hpp" />
<ClInclude Include="..\..\src\Cousine.hpp" />
<ClInclude Include="..\..\src\FontAwesomeSolid.hpp" />
<ClInclude Include="..\..\src\imgui_freetype.h" />
<ClInclude Include="..\..\src\imgui_impl_glfw_gl3.h" />
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets" Condition="Exists('packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets')" />
<Import Project="packages\freetype.2.8.0.1\build\native\freetype.targets" Condition="Exists('packages\freetype.2.8.0.1\build\native\freetype.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\freetype.redist.2.8.0.1\build\native\freetype.redist.targets'))" />
<Error Condition="!Exists('packages\freetype.2.8.0.1\build\native\freetype.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\freetype.2.8.0.1\build\native\freetype.targets'))" />
</Target>
</Project>
profiler/build/win32/Tracy.vcxproj.filters
+9
View File
@@ -72,6 +72,9 @@
<ClCompile Include="..\..\..\imguicolortextedit\TextEditor.cpp">
<Filter>imguicolortextedit</Filter>
</ClCompile>
<ClCompile Include="..\..\src\imgui_freetype.cpp">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\common\tracy_lz4.hpp">
@@ -212,8 +215,14 @@
<ClInclude Include="..\..\src\Cousine.hpp">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\src\imgui_freetype.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Natvis Include="DebugVis.natvis" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
profiler/build/win32/packages.config
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="freetype" version="2.8.0.1" targetFramework="native" />
<package id="freetype.redist" version="2.8.0.1" targetFramework="native" />
</packages>