From 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:34:04 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/Servo.vcxproj | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 65355a0..1abbf4b 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -50,9 +50,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
+ <CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -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,7 +271,7 @@
<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" />
@@ -288,11 +290,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,7 +365,7 @@
<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" />
--
Gitblit v1.9.3