diff options
author | chai <chaifix@163.com> | 2021-12-03 11:40:14 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2021-12-03 11:40:14 +0800 |
commit | e8e2283d264be24fc2f69d536b4bf58d3c403616 (patch) | |
tree | 9f1ab6fa618d22cac7f01de911a0e341e38907a3 /Client/Project/VisualStudio/Sand2D | |
parent | e9ff46e5c8cc1646eb780e64d01be7b3430a628c (diff) | |
parent | d9bd02c2471ec14c52df65cf7b5c106eddabe080 (diff) |
Merge branch 'master' of warmcat.org:/home/git-repo/PND
# Conflicts:
# Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters
# Client/Project/VisualStudio/Phy2Dlite/imgui.ini
Diffstat (limited to 'Client/Project/VisualStudio/Sand2D')
-rw-r--r-- | Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj | 2 | ||||
-rw-r--r-- | Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj index cd3760a..40ccb7d 100644 --- a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj +++ b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj @@ -123,6 +123,8 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\Source\Sand2D\Common\Settings.h" />
+ <ClInclude Include="..\..\..\Source\Sand2D\Common\Type.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters index 6e01002..09fef17 100644 --- a/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters +++ b/Client/Project/VisualStudio/Sand2D/Sand2D.vcxproj.filters @@ -4,5 +4,19 @@ <Filter Include="Test">
<UniqueIdentifier>{77ef3ecd-dd1e-49c7-a8fc-bcc241814405}</UniqueIdentifier>
</Filter>
+ <Filter Include="Common">
+ <UniqueIdentifier>{b84e6025-d740-4214-9aaf-b7344a5aa14a}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Elements">
+ <UniqueIdentifier>{cf6ce978-9e4b-4fd5-b187-3b3701eea6b0}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\Source\Sand2D\Common\Settings.h">
+ <Filter>Common</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Source\Sand2D\Common\Type.h">
+ <Filter>Common</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file |