From 47718a637fa239dcbec0fffca736f3c3b1cf7887 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期二, 10 十二月 2024 08:35:17 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/BondEq/BondEq.vcxproj |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 8c008d2..b18164e 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -115,7 +115,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.;.\View;.\DBManager;..\DatabaseSDK\include;..\BLControlsSDK\include;..\BLControlsSDK\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;.\View;.\DBManager;.\FileManager;..\DatabaseSDK\include;..\BLControlsSDK\include;..\BLControlsSDK\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -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" />
@@ -207,6 +209,7 @@
     <ClInclude Include="Context.h" />
     <ClInclude Include="CPanel.h" />
     <ClInclude Include="CParam.h" />
+    <ClInclude Include="CProjectPageComponents.h" />
     <ClInclude Include="CRemoteEqUnitView.h" />
     <ClInclude Include="CRemoteEqView.h" />
     <ClInclude Include="CHomeDialog.h" />
@@ -216,10 +219,16 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="Configuration.h" />
     <ClInclude Include="CPanelProject.h" />
+    <ClInclude Include="DBManager\AxisManager.h" />
     <ClInclude Include="DBManager\SystemLogManager.h" />
     <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" />
+    <ClInclude Include="GB2860SQLite.h" />
     <ClInclude Include="HmTab.h" />
     <ClInclude Include="HmVerticalTab.h" />
     <ClInclude Include="HorizontalLine.h" />
@@ -239,18 +248,24 @@
     <ClInclude Include="SetPage1.h" />
     <ClInclude Include="SetPage2.h" />
     <ClInclude Include="SettingsDlg.h" />
+    <ClInclude Include="sqlite3.h" />
+    <ClInclude Include="sqlite3ext.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
     <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" />
@@ -267,6 +282,7 @@
     <ClCompile Include="Context.cpp" />
     <ClCompile Include="CPanel.cpp" />
     <ClCompile Include="CParam.cpp" />
+    <ClCompile Include="CProjectPageComponents.cpp" />
     <ClCompile Include="CRemoteEqUnitView.cpp" />
     <ClCompile Include="CRemoteEqView.cpp" />
     <ClCompile Include="CHomeDialog.cpp" />
@@ -275,10 +291,17 @@
     <ClCompile Include="CProjectPageRemoteEqs.cpp" />
     <ClCompile Include="Configuration.cpp" />
     <ClCompile Include="CPanelProject.cpp" />
+    <ClCompile Include="DBManager\AxisManager.cpp" />
     <ClCompile Include="DBManager\SystemLogManager.cpp" />
     <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>
+    <ClCompile Include="FileManager\RecipeManager.cpp" />
+    <ClCompile Include="GB2860SQLite.cpp" />
     <ClCompile Include="HmTab.cpp" />
     <ClCompile Include="HmVerticalTab.cpp" />
     <ClCompile Include="HorizontalLine.cpp" />
@@ -297,6 +320,9 @@
     <ClCompile Include="SetPage1.cpp" />
     <ClCompile Include="SetPage2.cpp" />
     <ClCompile Include="SettingsDlg.cpp" />
+    <ClCompile Include="sqlite3.c">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -306,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" />
@@ -329,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