From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/SGMeasurement/SGMeasurement.vcxproj | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/SGMeasurement/SGMeasurement.vcxproj b/SourceCode/Bond/SGMeasurement/SGMeasurement.vcxproj
index 05fa356..f2b867e 100644
--- a/SourceCode/Bond/SGMeasurement/SGMeasurement.vcxproj
+++ b/SourceCode/Bond/SGMeasurement/SGMeasurement.vcxproj
@@ -175,7 +175,7 @@
<PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>.;..;.\DLL\64bit;.\CCLinkPerformance;..\MELSECSDK\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>MaxSpeed</Optimization>
+ <Optimization>Disabled</Optimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -209,6 +209,7 @@
<ClInclude Include="Logger.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="PLCSignalListener.h" />
+ <ClInclude Include="ProductResultStorage.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SGMeasurement.h" />
<ClInclude Include="SGMeasurementDlg.h" />
@@ -225,6 +226,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="PLCSignalListener.cpp" />
+ <ClCompile Include="ProductResultStorage.cpp" />
<ClCompile Include="SGMeasurement.cpp" />
<ClCompile Include="SGMeasurementDlg.cpp" />
</ItemGroup>
@@ -236,6 +238,7 @@
</ItemGroup>
<ItemGroup>
<Image Include="res\menu_close.ico" />
+ <Image Include="res\menu_open_dir.ico" />
<Image Include="res\menu_restore.ico" />
<Image Include="res\SGMeasurement.ico" />
</ItemGroup>
--
Gitblit v1.9.3