From e5d448c95b18b46068453fa95527f1de1f7f0d45 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 02 十二月 2024 08:29:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEq.vcxproj | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index b93d941..8dc6fb4 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -115,7 +115,7 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
- <AdditionalIncludeDirectories>.;.\View;.\DBManager;..\DatabaseSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;.\View;.\DBManager;..\DatabaseSDK\include;..\BLControlsSDK\include;..\BLControlsSDK\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -168,6 +168,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
+ <AdditionalIncludeDirectories>.;.\View;.\DBManager;..\DatabaseSDK\include;..\BLControlsSDK\include;..\BLControlsSDK\GridControl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -207,6 +208,7 @@
<ClInclude Include="Context.h" />
<ClInclude Include="CPanel.h" />
<ClInclude Include="CParam.h" />
+ <ClInclude Include="CProjectPageComponents.h" />
<ClInclude Include="CRemoteEqUnitView.h" />
<ClInclude Include="CRemoteEqView.h" />
<ClInclude Include="CHomeDialog.h" />
@@ -244,6 +246,7 @@
<ClInclude Include="targetver.h" />
<ClInclude Include="ToolUnits.h" />
<ClInclude Include="TopToolbar.h" />
+ <ClInclude Include="UserManagerDlg.h" />
<ClInclude Include="VerticalLine.h" />
<ClInclude Include="View\ChangePasswordDlg.h" />
<ClInclude Include="View\LoginDlg.h" />
@@ -266,6 +269,7 @@
<ClCompile Include="Context.cpp" />
<ClCompile Include="CPanel.cpp" />
<ClCompile Include="CParam.cpp" />
+ <ClCompile Include="CProjectPageComponents.cpp" />
<ClCompile Include="CRemoteEqUnitView.cpp" />
<ClCompile Include="CRemoteEqView.cpp" />
<ClCompile Include="CHomeDialog.cpp" />
@@ -306,6 +310,7 @@
</ClCompile>
<ClCompile Include="ToolUnits.cpp" />
<ClCompile Include="TopToolbar.cpp" />
+ <ClCompile Include="UserManagerDlg.cpp" />
<ClCompile Include="VerticalLine.cpp" />
<ClCompile Include="View\ChangePasswordDlg.cpp" />
<ClCompile Include="View\LoginDlg.cpp" />
--
Gitblit v1.9.3