From d3c3d619a2fc92c8d5b2929031cf7e946d57b44a Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 10:08:37 +0800
Subject: [PATCH] 1.合并后修复;
---
SourceCode/Bond/Servo/Servo.vcxproj | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 65355a0..c894f16 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -133,7 +133,7 @@
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PostBuildEvent>
- <Command>copy "$(TargetDir)$(ProjectName).exe" "\\Boounion-0106\Servo\\$(ProjectName).exe"</Command>
+ <Command>copy "$(TargetDir)$(ProjectName).exe" "\\DESKTOP-IODBVIQ\Servo\Debug\$(ProjectName).exe"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -195,11 +195,13 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="AlarmDlg.h" />
+ <ClInclude Include="PageAlarm.h" />
<ClInclude Include="AlarmManager.h" />
<ClInclude Include="ApredTreeCtrl2.h" />
<ClInclude Include="BlButton.h" />
<ClInclude Include="CAligner.h" />
+ <ClInclude Include="CArm.h" />
+ <ClInclude Include="CArmTray.h" />
<ClInclude Include="CAttribute.h" />
<ClInclude Include="CAttributeVector.h" />
<ClInclude Include="CBakeCooling.h" />
@@ -269,11 +271,10 @@
<ClInclude Include="Intent.h" />
<ClInclude Include="ListCtrlEx.h" />
<ClInclude Include="Log.h" />
- <ClInclude Include="LogDlg.h" />
+ <ClInclude Include="PageLog.h" />
<ClInclude Include="LogEdit.h" />
<ClInclude Include="MapPosWnd.h" />
<ClInclude Include="Model.h" />
- <ClInclude Include="ProductionLogDlg.h" />
<ClInclude Include="ProductionLogManager.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SECSRuntimeManager.h" />
@@ -288,11 +289,13 @@
<ClInclude Include="VerticalLine.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="AlarmDlg.cpp" />
+ <ClCompile Include="PageAlarm.cpp" />
<ClCompile Include="AlarmManager.cpp" />
<ClCompile Include="ApredTreeCtrl2.cpp" />
<ClCompile Include="BlButton.cpp" />
<ClCompile Include="CAligner.cpp" />
+ <ClCompile Include="CArm.cpp" />
+ <ClCompile Include="CArmTray.cpp" />
<ClCompile Include="CAttribute.cpp" />
<ClCompile Include="CAttributeVector.cpp" />
<ClCompile Include="CBakeCooling.cpp" />
@@ -361,11 +364,10 @@
<ClCompile Include="Intent.cpp" />
<ClCompile Include="ListCtrlEx.cpp" />
<ClCompile Include="Log.cpp" />
- <ClCompile Include="LogDlg.cpp" />
+ <ClCompile Include="PageLog.cpp" />
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="MapPosWnd.cpp" />
<ClCompile Include="Model.cpp" />
- <ClCompile Include="ProductionLogDlg.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
<ClCompile Include="SECSRuntimeManager.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
--
Gitblit v1.9.3