fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/MTerm1.vcxproj

@@ -23,21 +23,21 @@
    <ProjectGuid>{7AA827E9-4264-4C9C-A5EA-A04CA08C6D12}</ProjectGuid>

    <Keyword>MFCProj</Keyword>

    <RootNamespace>MTerm1</RootNamespace>

    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>

    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>

    <ProjectName>MTerm1</ProjectName>

  </PropertyGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v141</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v141</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

@@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v141</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

    <ConfigurationType>Application</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v141</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>Unicode</CharacterSet>

    <UseOfMfc>Dynamic</UseOfMfc>

@@ -80,14 +80,14 @@
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

    <LinkIncremental>true</LinkIncremental>

    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\WORK\VC_WORK\MTerm1\x64\Debug</LibraryPath>

    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;..\x64\Debug</LibraryPath>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

    <LinkIncremental>false</LinkIncremental>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

    <LinkIncremental>false</LinkIncremental>

    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;x64\Release</LibraryPath>

    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;x64\Release;..\x64\release</LibraryPath>

  </PropertyGroup>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

    <ClCompile>

@@ -192,6 +192,7 @@
  <ItemGroup>

    <ClInclude Include="AnsiParser.h" />

    <ClInclude Include="CMyFuncKeyToolBar.h" />

    <ClInclude Include="CMyPaneInputShow.h" />

    <ClInclude Include="CMyPropPage.h" />

    <ClInclude Include="DataParser1.h" />

    <ClInclude Include="DialogCoilMon.h" />

@@ -215,6 +216,7 @@
    <ClInclude Include="ChildFrm.h" />

    <ClInclude Include="MyDlgBarFuncKey.h" />

    <ClInclude Include="MyDlgBarInputShow.h" />

    <ClInclude Include="MyFormInputShow.h" />

    <ClInclude Include="PropCommCfg.h" />

    <ClInclude Include="PropInputCfg.h" />

    <ClInclude Include="PropMemCfg.h" />

@@ -248,6 +250,7 @@
    <ClCompile Include="..\MyLib\StaticEx.cpp" />

    <ClCompile Include="AnsiParser.cpp" />

    <ClCompile Include="CMyFuncKeyToolBar.cpp" />

    <ClCompile Include="CMyPaneInputShow.cpp" />

    <ClCompile Include="CMyPropPage.cpp" />

    <ClCompile Include="DataParser1.cpp" />

    <ClCompile Include="DialogCoilMon.cpp" />

@@ -270,6 +273,7 @@
    <ClCompile Include="ChildFrm.cpp" />

    <ClCompile Include="MyDlgBarFuncKey.cpp" />

    <ClCompile Include="MyDlgBarInputShow.cpp" />

    <ClCompile Include="MyFormInputShow.cpp" />

    <ClCompile Include="PropCommCfg.cpp" />

    <ClCompile Include="PropInputCfg.cpp" />

    <ClCompile Include="PropMemCfg.cpp" />