+freetype

6 files changed, 180 insertions, 11 deletions

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index b8c107f..4a17f96 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -175,7 +175,6 @@
     <ClCompile Include="..\..\..\Runtime\Debug\Log.cpp" />

     <ClCompile Include="..\..\..\Runtime\FileSystem\File.cpp" />

     <ClCompile Include="..\..\..\Runtime\FileSystem\FileJobs.cpp" />

-    <ClCompile Include="..\..\..\Runtime\FileSystem\FileWatcher.cpp" />

     <ClCompile Include="..\..\..\Runtime\FileSystem\ImageJobs.cpp" />

     <ClCompile Include="..\..\..\Runtime\FileSystem\Path.cpp" />

     <ClCompile Include="..\..\..\Runtime\FileSystem\Unzip.cpp" />

@@ -198,6 +197,7 @@
     <ClCompile Include="..\..\..\Runtime\Graphics\UIQuad.cpp" />

     <ClCompile Include="..\..\..\Runtime\Graphics\VertexAttribute.cpp" />

     <ClCompile Include="..\..\..\Runtime\Graphics\VertexBuffer.cpp" />

+    <ClCompile Include="..\..\..\Runtime\GUI\TextGenerator.cpp" />

     <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.cpp" />

     <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.cpp" />

     <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindEnum.cpp" />

@@ -255,7 +255,6 @@
     <ClInclude Include="..\..\..\Runtime\Debug\Log.h" />

     <ClInclude Include="..\..\..\Runtime\FileSystem\File.h" />

     <ClInclude Include="..\..\..\Runtime\FileSystem\FileJobs.h" />

-    <ClInclude Include="..\..\..\Runtime\FileSystem\FileWatcher.h" />

     <ClInclude Include="..\..\..\Runtime\FileSystem\ImageJobs.h" />

     <ClInclude Include="..\..\..\Runtime\FileSystem\Path.h" />

     <ClInclude Include="..\..\..\Runtime\FileSystem\Unzip.h" />

@@ -281,6 +280,8 @@
     <ClInclude Include="..\..\..\Runtime\Graphics\UIQuad.h" />

     <ClInclude Include="..\..\..\Runtime\Graphics\VertexAttribute.h" />

     <ClInclude Include="..\..\..\Runtime\Graphics\VertexBuffer.h" />

+    <ClInclude Include="..\..\..\Runtime\GUI\freetype.h" />

+    <ClInclude Include="..\..\..\Runtime\GUI\TextGenerator.h" />

     <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBind.h" />

     <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.h" />

     <ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.hpp" />

@@ -329,6 +330,9 @@
     <ClInclude Include="..\..\..\Runtime\Utilities\UtilMacros.h" />

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\freetype\freetype.vcxproj">

+      <Project>{c2945852-604d-4a1e-9cdc-9e2ddce2a1af}</Project>

+    </ProjectReference>

     <ProjectReference Include="..\glad\glad.vcxproj">

       <Project>{385f2d3a-1cef-4aa1-8051-527f6b68dd81}</Project>

     </ProjectReference>

diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index 202f3e5..abc9d4e 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -61,9 +61,6 @@
     <Filter Include="Editor\Graphics">

       <UniqueIdentifier>{66d581bf-85b1-4108-b1e1-d5e44f391af8}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Runtime\LuaUtils">

-      <UniqueIdentifier>{8810f29e-3166-4dd6-af85-8eebab583f0c}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Runtime\Lua">

       <UniqueIdentifier>{d076ff69-6f78-4c7d-be95-e59daf26a3e2}</UniqueIdentifier>

     </Filter>

@@ -112,6 +109,9 @@
     <Filter Include="Editor\FileSystem">

       <UniqueIdentifier>{2e2ecfca-fbaf-4761-8ea6-e7b2ab8a5b11}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Runtime\GUI">

+      <UniqueIdentifier>{2e933d36-b374-4029-a210-1e38f81886b8}</UniqueIdentifier>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">

@@ -381,12 +381,12 @@
     <ClCompile Include="..\..\..\Runtime\Math\Vector4.cpp">

       <Filter>Runtime\Math</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\Runtime\FileSystem\FileWatcher.cpp">

-      <Filter>Runtime\FileSystem</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\Editor\FileSystem\FileWatcher.cpp">

       <Filter>Editor\FileSystem</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\Runtime\GUI\TextGenerator.cpp">

+      <Filter>Runtime\GUI</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">

@@ -656,12 +656,15 @@
     <ClInclude Include="..\..\..\Runtime\Utilities\Callback.h">

       <Filter>Runtime\Utilities</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\Runtime\FileSystem\FileWatcher.h">

-      <Filter>Runtime\FileSystem</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\Editor\FileSystem\FileWatcher.h">

       <Filter>Editor\FileSystem</Filter>

     </ClInclude>

+    <ClInclude Include="..\..\..\Runtime\GUI\TextGenerator.h">

+      <Filter>Runtime\GUI</Filter>

+    </ClInclude>

+    <ClInclude Include="..\..\..\Runtime\GUI\freetype.h">

+      <Filter>Runtime\GUI</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">

diff --git a/Projects/VisualStudio/GameLab.sln b/Projects/VisualStudio/GameLab.sln
index 9a7496c..7333881 100644
--- a/Projects/VisualStudio/GameLab.sln
+++ b/Projects/VisualStudio/GameLab.sln
@@ -31,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsyncTask", "AsyncTask\Asyn
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hash-library", "hash-library\hash-library.vcxproj", "{F5341260-AFF4-4F99-9182-C8A0673E3B14}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype\freetype.vcxproj", "{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|x64 = Debug|x64

@@ -135,6 +137,14 @@ Global
 		{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x64.Build.0 = Release|x64

 		{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x86.ActiveCfg = Release|Win32

 		{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x86.Build.0 = Release|Win32

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Debug|x64.ActiveCfg = Debug|x64

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Debug|x64.Build.0 = Debug|x64

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Debug|x86.ActiveCfg = Debug|Win32

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Debug|x86.Build.0 = Debug|Win32

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Release|x64.ActiveCfg = Release|x64

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Release|x64.Build.0 = Release|x64

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Release|x86.ActiveCfg = Release|Win32

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}.Release|x86.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -150,6 +160,7 @@ Global
 		{DA1F3ADE-9327-4BE9-815A-3D6F8651DD2C} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F}

 		{C22BBF64-192D-430B-9D93-72B6E4DD3F02} = {537FD9FB-28BD-422B-B144-98D8C229FFF8}

 		{F5341260-AFF4-4F99-9182-C8A0673E3B14} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F}

+		{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF} = {0F6EE105-E1FF-4770-8314-06F9F98FB68F}

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 		SolutionGuid = {C78D376C-9B0B-4EF0-A7D1-0F612F43E793}

diff --git a/Projects/VisualStudio/freetype/freetype.vcxproj b/Projects/VisualStudio/freetype/freetype.vcxproj
new file mode 100644
index 0000000..0549849
--- /dev/null
+++ b/Projects/VisualStudio/freetype/freetype.vcxproj
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{C2945852-604D-4A1E-9CDC-9E2DDCE2A1AF}</ProjectGuid>
+    <RootNamespace>freetype</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/freetype/freetype.vcxproj.filters b/Projects/VisualStudio/freetype/freetype.vcxproj.filters
new file mode 100644
index 0000000..3c6f4fd
--- /dev/null
+++ b/Projects/VisualStudio/freetype/freetype.vcxproj.filters
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="源文件">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="头文件">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="资源文件">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/freetype/freetype.vcxproj.user b/Projects/VisualStudio/freetype/freetype.vcxproj.user
new file mode 100644
index 0000000..be25078
--- /dev/null
+++ b/Projects/VisualStudio/freetype/freetype.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
\ No newline at end of file