From 863f21995955fb3e9aa471430218967d4e642c27 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 29 五月 2025 16:11:24 +0800
Subject: [PATCH] Merge branch 'liuyang'
---
SourceCode/Bond/Servo/Servo.vcxproj | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 8fac7f2..11eb375 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>
@@ -204,6 +204,20 @@
<ClInclude Include="CRobotCmdTestDlg.h" />
<ClInclude Include="CPagePortStatus.h" />
<ClInclude Include="CPortStatusReport.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="JobSlotGrid.h" />
<ClInclude Include="MsgDlg.h" />
<ClInclude Include="PageRecipe.h" />
@@ -290,6 +304,7 @@
<ClInclude Include="MapPosWnd.h" />
<ClInclude Include="Model.h" />
<ClInclude Include="PageRobotCmd.h" />
+ <ClInclude Include="PortConfigurationDlg.h" />
<ClInclude Include="ProductionLogManager.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SECSRuntimeManager.h" />
@@ -302,6 +317,7 @@
<ClInclude Include="targetver.h" />
<ClInclude Include="TerminalDisplayDlg.h" />
<ClInclude Include="ToolUnits.h" />
+ <ClInclude Include="TransferManager.h" />
<ClInclude Include="VerticalLine.h" />
</ItemGroup>
<ItemGroup>
@@ -311,6 +327,18 @@
<ClCompile Include="CRobotCmdTestDlg.cpp" />
<ClCompile Include="CPagePortStatus.cpp" />
<ClCompile Include="CPortStatusReport.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="JobSlotGrid.cpp" />
<ClCompile Include="MsgDlg.cpp" />
<ClCompile Include="PageRecipe.cpp" />
@@ -396,6 +424,7 @@
<ClCompile Include="MapPosWnd.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="PageRobotCmd.cpp" />
+ <ClCompile Include="PortConfigurationDlg.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
<ClCompile Include="SECSRuntimeManager.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
@@ -410,6 +439,7 @@
</ClCompile>
<ClCompile Include="TerminalDisplayDlg.cpp" />
<ClCompile Include="ToolUnits.cpp" />
+ <ClCompile Include="TransferManager.cpp" />
<ClCompile Include="VerticalLine.cpp" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3