From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/Servo/Servo.vcxproj |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 51 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 7343585..a6f4ee0 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -115,7 +115,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>.;..;..\DatabaseSDK\include;..\MELSECSDK\include;.\CCLinkPerformance;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\DatabaseSDK\include;..\MELSECSDK\include;.\CCLinkPerformance;.\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -200,8 +200,29 @@
   <ItemGroup>
     <ClInclude Include="CEquipmentPage3.h" />
     <ClInclude Include="CGlassPool.h" />
+    <ClInclude Include="CMyStatusbar.h" />
+    <ClInclude Include="CRobotCmdContainerDlg.h" />
+    <ClInclude Include="CRobotCmdTestDlg.h" />
     <ClInclude Include="CPagePortStatus.h" />
     <ClInclude Include="CPortStatusReport.h" />
+    <ClInclude Include="CRobotTaskDlg.h" />
+    <ClInclude Include="GridControl\CellRange.h" />
+    <ClInclude Include="GridControl\GridCell.h" />
+    <ClInclude Include="GridControl\GridCellBase.h" />
+    <ClInclude Include="GridControl\GridCellButton.h" />
+    <ClInclude Include="GridControl\GridCtrl.h" />
+    <ClInclude Include="GridControl\GridDropTarget.h" />
+    <ClInclude Include="GridControl\GridInPlaceEdit.h" />
+    <ClInclude Include="GridControl\GridMemDC.h" />
+    <ClInclude Include="GridControl\NewCellTypes\GridCellCheck.h" />
+    <ClInclude Include="GridControl\NewCellTypes\GridCellCombo.h" />
+    <ClInclude Include="GridControl\NewCellTypes\GridCellDateTime.h" />
+    <ClInclude Include="GridControl\NewCellTypes\GridCellNumeric.h" />
+    <ClInclude Include="GridControl\NewCellTypes\GridURLCell.h" />
+    <ClInclude Include="GridControl\TitleTip.h" />
+    <ClInclude Include="CRobotTask.h" />
+    <ClInclude Include="CSlot.h" />
+    <ClInclude Include="HorizontalLine.h" />
     <ClInclude Include="JobSlotGrid.h" />
     <ClInclude Include="MsgDlg.h" />
     <ClInclude Include="PageRecipe.h" />
@@ -287,6 +308,9 @@
     <ClInclude Include="LogEdit.h" />
     <ClInclude Include="MapPosWnd.h" />
     <ClInclude Include="Model.h" />
+    <ClInclude Include="PageRobotCmd.h" />
+    <ClInclude Include="PageTransferLog.h" />
+    <ClInclude Include="PortConfigurationDlg.h" />
     <ClInclude Include="ProductionLogManager.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="SECSRuntimeManager.h" />
@@ -299,13 +323,34 @@
     <ClInclude Include="targetver.h" />
     <ClInclude Include="TerminalDisplayDlg.h" />
     <ClInclude Include="ToolUnits.h" />
+    <ClInclude Include="TransferManager.h" />
+    <ClInclude Include="TopToolbar.h" />
     <ClInclude Include="VerticalLine.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CEquipmentPage3.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
+    <ClCompile Include="CMyStatusbar.cpp" />
+    <ClCompile Include="CRobotCmdContainerDlg.cpp" />
+    <ClCompile Include="CRobotCmdTestDlg.cpp" />
     <ClCompile Include="CPagePortStatus.cpp" />
     <ClCompile Include="CPortStatusReport.cpp" />
+    <ClCompile Include="CRobotTaskDlg.cpp" />
+    <ClCompile Include="GridControl\GridCell.cpp" />
+    <ClCompile Include="GridControl\GridCellBase.cpp" />
+    <ClCompile Include="GridControl\GridCellButton.cpp" />
+    <ClCompile Include="GridControl\GridCtrl.cpp" />
+    <ClCompile Include="GridControl\GridDropTarget.cpp" />
+    <ClCompile Include="GridControl\GridInPlaceEdit.cpp" />
+    <ClCompile Include="GridControl\NewCellTypes\GridCellCheck.cpp" />
+    <ClCompile Include="GridControl\NewCellTypes\GridCellCombo.cpp" />
+    <ClCompile Include="GridControl\NewCellTypes\GridCellDateTime.cpp" />
+    <ClCompile Include="GridControl\NewCellTypes\GridCellNumeric.cpp" />
+    <ClCompile Include="GridControl\NewCellTypes\GridURLCell.cpp" />
+    <ClCompile Include="GridControl\TitleTip.cpp" />
+    <ClCompile Include="CRobotTask.cpp" />
+    <ClCompile Include="CSlot.cpp" />
+    <ClCompile Include="HorizontalLine.cpp" />
     <ClCompile Include="JobSlotGrid.cpp" />
     <ClCompile Include="MsgDlg.cpp" />
     <ClCompile Include="PageRecipe.cpp" />
@@ -390,6 +435,9 @@
     <ClCompile Include="LogEdit.cpp" />
     <ClCompile Include="MapPosWnd.cpp" />
     <ClCompile Include="Model.cpp" />
+    <ClCompile Include="PageRobotCmd.cpp" />
+    <ClCompile Include="PageTransferLog.cpp" />
+    <ClCompile Include="PortConfigurationDlg.cpp" />
     <ClCompile Include="ProductionLogManager.cpp" />
     <ClCompile Include="SECSRuntimeManager.cpp" />
     <ClCompile Include="SecsTestDlg.cpp" />
@@ -404,6 +452,8 @@
     </ClCompile>
     <ClCompile Include="TerminalDisplayDlg.cpp" />
     <ClCompile Include="ToolUnits.cpp" />
+    <ClCompile Include="TransferManager.cpp" />
+    <ClCompile Include="TopToolbar.cpp" />
     <ClCompile Include="VerticalLine.cpp" />
   </ItemGroup>
   <ItemGroup>

--
Gitblit v1.9.3