From 3d230572f45ed8e94d954231c90ec905c4390e54 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 09 十二月 2024 18:25:41 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/BondEq/BondEq.vcxproj | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 3b13edb..b18164e 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -191,6 +191,8 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="CComponentDlg.h" />
+ <ClInclude Include="CComponentPLCDlg.h" />
<ClInclude Include="CPLC.h" />
<ClInclude Include="AccordionWnd.h" />
<ClInclude Include="Alarm.h" />
@@ -222,6 +224,7 @@
<ClInclude Include="DBManager\UserManager.h" />
<ClInclude Include="EQState.h" />
<ClInclude Include="EQStateMonitor.h" />
+ <ClInclude Include="FileManager\IOManager.h" />
<ClInclude Include="FileManager\pugiconfig.hpp" />
<ClInclude Include="FileManager\pugixml.hpp" />
<ClInclude Include="FileManager\RecipeManager.h" />
@@ -252,13 +255,17 @@
<ClInclude Include="ToolUnits.h" />
<ClInclude Include="TopToolbar.h" />
<ClInclude Include="VerticalLine.h" />
+ <ClInclude Include="View\AxisDetailSettingsDlg.h" />
<ClInclude Include="View\AxisSettingsDlg.h" />
<ClInclude Include="View\ChangePasswordDlg.h" />
+ <ClInclude Include="View\IOMonitoringDlg.h" />
<ClInclude Include="View\LoginDlg.h" />
<ClInclude Include="View\SystemLogManagerDlg.h" />
<ClInclude Include="View\UserManagerDlg.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="CComponentDlg.cpp" />
+ <ClCompile Include="CComponentPLCDlg.cpp" />
<ClCompile Include="CPLC.cpp" />
<ClCompile Include="AccordionWnd.cpp" />
<ClCompile Include="Alarm.cpp" />
@@ -289,6 +296,7 @@
<ClCompile Include="DBManager\UserManager.cpp" />
<ClCompile Include="EQState.cpp" />
<ClCompile Include="EQStateMonitor.cpp" />
+ <ClCompile Include="FileManager\IOManager.cpp" />
<ClCompile Include="FileManager\pugixml.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
@@ -324,8 +332,10 @@
<ClCompile Include="ToolUnits.cpp" />
<ClCompile Include="TopToolbar.cpp" />
<ClCompile Include="VerticalLine.cpp" />
+ <ClCompile Include="View\AxisDetailSettingsDlg.cpp" />
<ClCompile Include="View\AxisSettingsDlg.cpp" />
<ClCompile Include="View\ChangePasswordDlg.cpp" />
+ <ClCompile Include="View\IOMonitoringDlg.cpp" />
<ClCompile Include="View\LoginDlg.cpp" />
<ClCompile Include="View\SystemLogManagerDlg.cpp" />
<ClCompile Include="View\UserManagerDlg.cpp" />
@@ -347,7 +357,7 @@
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
- <UserProperties RESOURCE_FILE="BondServo.rc" />
+ <UserProperties RESOURCE_FILE="" />
</VisualStudio>
</ProjectExtensions>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3