From 43c7dc211f10851480352b12bd01f3443079bb01 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 26 八月 2025 09:09:21 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Servo.vcxproj | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 008f416..ec95643 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -117,6 +117,7 @@
<PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>.;..;..\DatabaseSDK\include;..\MELSECSDK\include;.\CCLinkPerformance;.\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -200,9 +201,12 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="CBaseDlg.h" />
+ <ClInclude Include="CControlJob.h" />
+ <ClInclude Include="CControlJobDlg.h" />
<ClInclude Include="CCustomCheckBox.h" />
<ClInclude Include="CCollectionEvent.h" />
<ClInclude Include="CEquipmentPage3.h" />
+ <ClInclude Include="CExpandableListCtrl.h" />
<ClInclude Include="CGlassPool.h" />
<ClInclude Include="ChangePasswordDlg.h" />
<ClInclude Include="CMyStatusbar.h" />
@@ -324,12 +328,14 @@
<ClInclude Include="PageRobotCmd.h" />
<ClInclude Include="PageTransferLog.h" />
<ClInclude Include="PortConfigurationDlg.h" />
+ <ClInclude Include="ProcessJob.h" />
<ClInclude Include="ProductionLogManager.h" />
<ClInclude Include="RecipeDeviceBindDlg.h" />
<ClInclude Include="RecipeManager.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SECSRuntimeManager.h" />
<ClInclude Include="SecsTestDlg.h" />
+ <ClInclude Include="SerializeUtil.h" />
<ClInclude Include="Servo.h" />
<ClInclude Include="ServoCommo.h" />
<ClInclude Include="ServoDlg.h" />
@@ -349,9 +355,12 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="CBaseDlg.cpp" />
+ <ClCompile Include="CControlJob.cpp" />
+ <ClCompile Include="CControlJobDlg.cpp" />
<ClCompile Include="CCustomCheckBox.cpp" />
<ClCompile Include="CCollectionEvent.cpp" />
<ClCompile Include="CEquipmentPage3.cpp" />
+ <ClCompile Include="CExpandableListCtrl.cpp" />
<ClCompile Include="CGlassPool.cpp" />
<ClCompile Include="ChangePasswordDlg.cpp" />
<ClCompile Include="CMyStatusbar.cpp" />
@@ -470,6 +479,7 @@
<ClCompile Include="PageRobotCmd.cpp" />
<ClCompile Include="PageTransferLog.cpp" />
<ClCompile Include="PortConfigurationDlg.cpp" />
+ <ClCompile Include="ProcessJob.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
<ClCompile Include="RecipeDeviceBindDlg.cpp" />
<ClCompile Include="RecipeManager.cpp" />
--
Gitblit v1.9.3