From fc8d367963a16de61dfbc4a0ff34c78c91ec2cfe Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 05 九月 2025 09:21:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/Servo/Servo.vcxproj |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 3b20373..a4e27f1 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -46,6 +46,7 @@
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
+    <EnableASAN>false</EnableASAN>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -116,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>
@@ -134,8 +136,8 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>if exist "\\DESKTOP-IODBVIQ\Servo\Debug\" (
-    xcopy /Y /D "$(OutDir)*.exe" "\\DESKTOP-IODBVIQ\Servo\Debug\"
-    xcopy /Y /D "$(OutDir)*.pdb" "\\DESKTOP-IODBVIQ\Servo\Debug\"
+    xcopy /Y /D "$(OutDir)Servo.exe" "\\DESKTOP-IODBVIQ\Servo\Debug\"
+    xcopy /Y /D "$(OutDir)Servo.pdb" "\\DESKTOP-IODBVIQ\Servo\Debug\"
 )</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -199,16 +201,27 @@
   </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" />
+    <ClInclude Include="CPageCollectionEvent.h" />
     <ClInclude Include="CPageLinkSignal.h" />
+    <ClInclude Include="CPageReport.h" />
+    <ClInclude Include="CPageVarialbles.h" />
+    <ClInclude Include="CParam.h" />
+    <ClInclude Include="CReport.h" />
     <ClInclude Include="CRobotCmdContainerDlg.h" />
     <ClInclude Include="CRobotCmdTestDlg.h" />
     <ClInclude Include="CPagePortStatus.h" />
     <ClInclude Include="CPortStatusReport.h" />
     <ClInclude Include="CRobotTaskDlg.h" />
+    <ClInclude Include="CVariable.h" />
     <ClInclude Include="GridControl\CellRange.h" />
     <ClInclude Include="GridControl\GridCell.h" />
     <ClInclude Include="GridControl\GridCellBase.h" />
@@ -316,12 +329,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" />
@@ -341,16 +356,27 @@
   </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" />
+    <ClCompile Include="CPageCollectionEvent.cpp" />
     <ClCompile Include="CPageLinkSignal.cpp" />
+    <ClCompile Include="CPageReport.cpp" />
+    <ClCompile Include="CPageVarialbles.cpp" />
+    <ClCompile Include="CParam.cpp" />
+    <ClCompile Include="CReport.cpp" />
     <ClCompile Include="CRobotCmdContainerDlg.cpp" />
     <ClCompile Include="CRobotCmdTestDlg.cpp" />
     <ClCompile Include="CPagePortStatus.cpp" />
     <ClCompile Include="CPortStatusReport.cpp" />
     <ClCompile Include="CRobotTaskDlg.cpp" />
+    <ClCompile Include="CVariable.cpp" />
     <ClCompile Include="GridControl\GridCell.cpp" />
     <ClCompile Include="GridControl\GridCellBase.cpp" />
     <ClCompile Include="GridControl\GridCellButton.cpp" />
@@ -455,6 +481,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