From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Servo.vcxproj.filters | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 2cd9e80..e8763fd 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -181,7 +181,17 @@
<ClCompile Include="CExpandableListCtrl.cpp" />
<ClCompile Include="CControlJobDlg.cpp" />
<ClCompile Include="CParam.cpp" />
- <ClCompile Include="DeviceRecipeParamDlg.cpp" />
+ <ClCompile Include="CPageGlassList.cpp" />
+ <ClCompile Include="GlassJson.cpp" />
+ <ClCompile Include="..\jsoncpp\lib_json\json_reader.cpp">
+ <Filter>JsonCpp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\jsoncpp\lib_json\json_value.cpp">
+ <Filter>JsonCpp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\jsoncpp\lib_json\json_writer.cpp">
+ <Filter>JsonCpp</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -369,7 +379,35 @@
<ClInclude Include="CExpandableListCtrl.h" />
<ClInclude Include="CControlJobDlg.h" />
<ClInclude Include="CParam.h" />
- <ClInclude Include="DeviceRecipeParamDlg.h" />
+ <ClInclude Include="CPageGlassList.h" />
+ <ClInclude Include="GlassJson.h" />
+ <ClInclude Include="..\jsoncpp\include\json\autolink.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\config.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\features.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\forwards.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\json.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\reader.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\value.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\writer.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
@@ -380,6 +418,18 @@
<ItemGroup>
<None Include="packages.config" />
<None Include="res\Servo.rc2" />
+ <None Include="..\jsoncpp\lib_json\json_internalarray.inl">
+ <Filter>JsonCpp</Filter>
+ </None>
+ <None Include="..\jsoncpp\lib_json\json_internalmap.inl">
+ <Filter>JsonCpp</Filter>
+ </None>
+ <None Include="..\jsoncpp\lib_json\json_valueiterator.inl">
+ <Filter>JsonCpp</Filter>
+ </None>
+ <None Include="..\jsoncpp\lib_json\sconscript">
+ <Filter>JsonCpp</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
@@ -394,5 +444,8 @@
<Filter Include="GridControl\NewCellTypes">
<UniqueIdentifier>{52ebd40d-fb71-4a53-93ab-5b93670c706d}</UniqueIdentifier>
</Filter>
+ <Filter Include="JsonCpp">
+ <UniqueIdentifier>{a877af37-2f78-484f-b1bb-276edbbcd694}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3