From 009eda749899fc85d3a75ad2016371f27436bf36 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 09 一月 2025 14:04:16 +0800
Subject: [PATCH] Merge branch 'liuyang' into chenluhua

---
 SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj |   40 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj b/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
index 74969b5..7b7068a 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLC.vcxproj
@@ -52,7 +52,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
     <UseOfMfc>Dynamic</UseOfMfc>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -116,6 +116,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>.;.\DBManager;..\DatabaseSDK\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -168,6 +169,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>.;.\DBManager;..\DatabaseSDK\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -191,6 +193,9 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\BondEq\HorizontalLine.h" />
+    <ClInclude Include="Alarm.h" />
+    <ClInclude Include="AlarmMonitor.h" />
+    <ClInclude Include="AlarmPopupDlg.h" />
     <ClInclude Include="ApredTreeCtrl.h" />
     <ClInclude Include="BlButton.h" />
     <ClInclude Include="BoounionPLC.h" />
@@ -198,8 +203,21 @@
     <ClInclude Include="CBaseView.h" />
     <ClInclude Include="CMainContainer.h" />
     <ClInclude Include="Common.h" />
+    <ClInclude Include="Component.h" />
     <ClInclude Include="Configuration.h" />
+    <ClInclude Include="Context.h" />
+    <ClInclude Include="CPageLogcat.h" />
+    <ClInclude Include="DBManager\AlarmManager.h" />
+    <ClInclude Include="DBManager\AxisManager.h" />
+    <ClInclude Include="DBManager\SystemLogManager.h" />
+    <ClInclude Include="DBManager\UserManager.h" />
+    <ClInclude Include="Intent.h" />
     <ClInclude Include="Log.h" />
+    <ClInclude Include="LogEdit.h" />
+    <ClInclude Include="McBool.h" />
+    <ClInclude Include="McInt.h" />
+    <ClInclude Include="McItem.h" />
+    <ClInclude Include="McString.h" />
     <ClInclude Include="Model.h" />
     <ClInclude Include="PagePlcList.h" />
     <ClInclude Include="PLC.h" />
@@ -207,19 +225,38 @@
     <ClInclude Include="Resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
+    <ClInclude Include="ToolUnits.h" />
     <ClInclude Include="TopToolbar.h" />
     <ClInclude Include="VerticalLine.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\BondEq\HorizontalLine.cpp" />
+    <ClCompile Include="Alarm.cpp" />
+    <ClCompile Include="AlarmMonitor.cpp" />
+    <ClCompile Include="AlarmPopupDlg.cpp" />
     <ClCompile Include="ApredTreeCtrl.cpp" />
     <ClCompile Include="BlButton.cpp" />
     <ClCompile Include="BoounionPLC.cpp" />
     <ClCompile Include="BoounionPLCDlg.cpp" />
     <ClCompile Include="CBaseView.cpp" />
     <ClCompile Include="CMainContainer.cpp" />
+    <ClCompile Include="Component.cpp" />
     <ClCompile Include="Configuration.cpp" />
+    <ClCompile Include="Context.cpp" />
+    <ClCompile Include="CPageLogcat.cpp" />
+    <ClCompile Include="DBManager\AlarmManager.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="DBManager\AxisManager.cpp" />
+    <ClCompile Include="DBManager\SystemLogManager.cpp" />
+    <ClCompile Include="DBManager\UserManager.cpp" />
+    <ClCompile Include="Intent.cpp" />
     <ClCompile Include="Log.cpp" />
+    <ClCompile Include="LogEdit.cpp" />
+    <ClCompile Include="McBool.cpp" />
+    <ClCompile Include="McInt.cpp" />
+    <ClCompile Include="McItem.cpp" />
+    <ClCompile Include="McString.cpp" />
     <ClCompile Include="Model.cpp" />
     <ClCompile Include="PagePlcList.cpp" />
     <ClCompile Include="PLC.cpp" />
@@ -230,6 +267,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="ToolUnits.cpp" />
     <ClCompile Include="TopToolbar.cpp" />
     <ClCompile Include="VerticalLine.cpp" />
   </ItemGroup>

--
Gitblit v1.9.3