diff options
| author | chai <chaifix@163.com> | 2021-10-30 13:28:39 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-10-30 13:28:39 +0800 |
| commit | c3e259f4d29e9bdcb73617ad8e4d71f117b4d289 (patch) | |
| tree | 893ed7b892d0b3b49db2d3e219da28fc2eea4769 /Projects/VisualStudio/Editor | |
| parent | b2433cf2faf5c5c3d82d61c7b44928923c5fdcda (diff) | |
+freetype
Diffstat (limited to 'Projects/VisualStudio/Editor')
| -rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj | 13 | ||||
| -rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj.filters | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj index 4a17f96..d845f72 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj +++ b/Projects/VisualStudio/Editor/Editor.vcxproj @@ -88,11 +88,12 @@ <SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<PreprocessorDefinitions>GAMELAB_WIN;_CRT_SECURE_NO_WARNINGS;GAMELAB_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\..\ThirdParty\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\..\;$(SolutionDir)..\..\ThirdParty\;%(AdditionalIncludeDirectories);$(SolutionDir)..\..\ThirdParty\freetype\include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty\freetype\release static\vs2015-2019\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -133,13 +134,15 @@ <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
- <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories);$(SolutionDir)..\..\ThirdParty\freetype\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>GAMELAB_WIN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty\freetype\release static\vs2015-2019\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -304,6 +307,7 @@ <ClInclude Include="..\..\..\Runtime\Lua\LuaHelper.h" />
<ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
<ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\Math.h" />
<ClInclude Include="..\..\..\Runtime\Math\Matrix44.h" />
<ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
<ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
@@ -330,9 +334,6 @@ <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 abc9d4e..e816c60 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -665,6 +665,9 @@ <ClInclude Include="..\..\..\Runtime\GUI\freetype.h">
<Filter>Runtime\GUI</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\Math.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">
|