fix conflict

QuakeGod

2023-10-20 6fa60de2b0d0237054aa7571191df0f291838031

 MTerm1/MTerm1.vcxproj

@@ -23,20 +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>

@@ -44,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>

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

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

    <LinkIncremental>true</LinkIncremental>

    <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;..\x64\release</LibraryPath>

  </PropertyGroup>

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

    <ClCompile>

@@ -187,71 +190,155 @@
    </ResourceCompile>

  </ItemDefinitionGroup>

  <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" />

    <ClInclude Include="DialogCommSet1.h" />

    <ClInclude Include="DialogFactCfg.h" />

    <ClInclude Include="DialogIoComment.h" />

    <ClInclude Include="DialogSetCoil.h" />

    <ClInclude Include="DialogSetData.h" />

    <ClInclude Include="KDefine.h" />

    <ClInclude Include="KMachine.h" />

    <ClInclude Include="MTerm1CommDevView.h" />

    <ClInclude Include="MTerm1CommTestView.h" />

    <ClInclude Include="DialogDataMon.h" />

    <ClInclude Include="DialogDateTime.h" />

    <ClInclude Include="DialogEventLog.h" />

    <ClInclude Include="DialogForceIO.h" />

    <ClInclude Include="DialogInfoDisplay.h" />

    <ClInclude Include="DialogProgress.h" />

    <ClInclude Include="DialogStatusShow.h" />

    <ClInclude Include="DialogSysRegSet.h" />

    <ClInclude Include="ChildFrm.h" />

    <ClInclude Include="ClassView.h" />

    <ClInclude Include="FileView.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" />

    <ClInclude Include="PropModeCfg.h" />

    <ClInclude Include="PropOutputCfg.h" />

    <ClInclude Include="PropSysReg1.h" />

    <ClInclude Include="KLinkDefine.h" />

    <ClInclude Include="MTerm1ProgTxt.h" />

    <ClInclude Include="framework.h" />

    <ClInclude Include="MainFrm.h" />

    <ClInclude Include="MTerm1BldView.h" />

    <ClInclude Include="MTerm1BnlView.h" />

    <ClInclude Include="MTerm1CoilView.h" />

    <ClInclude Include="MTerm1CtrlView.h" />

    <ClInclude Include="MTerm1DataView.h" />

    <ClInclude Include="MTerm1LdsView.h" />

    <ClInclude Include="MTerm1TestView.h" />

    <ClInclude Include="MTerm1.h" />

    <ClInclude Include="MTerm1Doc.h" />

    <ClInclude Include="MTerm1View.h" />

    <ClInclude Include="OutputWnd.h" />

    <ClInclude Include="MyDialogLog.h" />

    <ClInclude Include="MyFormLog.h" />

    <ClInclude Include="MyPaneLog.h" />

    <ClInclude Include="NavView.h" />

    <ClInclude Include="pch.h" />

    <ClInclude Include="PropertiesWnd.h" />

    <ClInclude Include="Resource.h" />

    <ClInclude Include="targetver.h" />

    <ClInclude Include="ViewTree.h" />

  </ItemGroup>

  <ItemGroup>

    <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" />

    <ClCompile Include="DialogCommSet1.cpp" />

    <ClCompile Include="DialogFactCfg.cpp" />

    <ClCompile Include="DialogIoComment.cpp" />

    <ClCompile Include="DialogSetCoil.cpp" />

    <ClCompile Include="DialogSetData.cpp" />

    <ClCompile Include="KMachine.cpp" />

    <ClCompile Include="MTerm1CommDevView.cpp" />

    <ClCompile Include="MTerm1CommTestView.cpp" />

    <ClCompile Include="DialogDataMon.cpp" />

    <ClCompile Include="DialogDateTime.cpp" />

    <ClCompile Include="DialogEventLog.cpp" />

    <ClCompile Include="DialogForceIO.cpp" />

    <ClCompile Include="DialogInfoDisplay.cpp" />

    <ClCompile Include="DialogProgress.cpp" />

    <ClCompile Include="DialogStatusShow.cpp" />

    <ClCompile Include="DialogSysRegSet.cpp" />

    <ClCompile Include="ChildFrm.cpp" />

    <ClCompile Include="ClassView.cpp" />

    <ClCompile Include="FileView.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" />

    <ClCompile Include="PropModeCfg.cpp" />

    <ClCompile Include="PropOutputCfg.cpp" />

    <ClCompile Include="PropSysReg1.cpp" />

    <ClCompile Include="MTerm1ProgTxt.cpp" />

    <ClCompile Include="MainFrm.cpp" />

    <ClCompile Include="MTerm1BldView.cpp" />

    <ClCompile Include="MTerm1BnlView.cpp" />

    <ClCompile Include="MTerm1CoilView.cpp" />

    <ClCompile Include="MTerm1CtrlView.cpp" />

    <ClCompile Include="MTerm1DataView.cpp" />

    <ClCompile Include="MTerm1LdsView.cpp" />

    <ClCompile Include="MTerm1TestView.cpp" />

    <ClCompile Include="MTerm1.cpp" />

    <ClCompile Include="MTerm1Doc.cpp" />

    <ClCompile Include="MTerm1View.cpp" />

    <ClCompile Include="OutputWnd.cpp" />

    <ClCompile Include="MyDialogLog.cpp" />

    <ClCompile Include="MyFormLog.cpp" />

    <ClCompile Include="MyPaneLog.cpp" />

    <ClCompile Include="NavView.cpp" />

    <ClCompile Include="pch.cpp">

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

    </ClCompile>

    <ClCompile Include="PropertiesWnd.cpp" />

    <ClCompile Include="ViewTree.cpp" />

  </ItemGroup>

  <ItemGroup>

    <ResourceCompile Include="MTerm1.rc" />

  </ItemGroup>

  <ItemGroup>

    <None Include="devices.cfg" />

    <None Include="Readme.md" />

    <None Include="res\MTerm1.rc2" />

  </ItemGroup>

  <ItemGroup>

    <Image Include="res\bitmap1.bmp" />

    <Image Include="res\bmp00001.bmp" />

    <Image Include="res\bmp00002.bmp" />

    <Image Include="res\bmp00003.bmp" />

    <Image Include="res\bmp00004.bmp" />

    <Image Include="res\classview.bmp" />

    <Image Include="res\classview_hc.bmp" />

    <Image Include="res\class_view.ico" />

    <Image Include="res\class_view_hc.ico" />

    <Image Include="res\explorer.bmp" />

    <Image Include="res\explorer_hc.bmp" />

    <Image Include="res\fileview.bmp" />

    <Image Include="res\fileview_hc.bmp" />

    <Image Include="res\file_view.ico" />

    <Image Include="res\file_view_hc.ico" />

    <Image Include="res\menuimages.bmp" />

    <Image Include="res\menuimages_hc.bmp" />

    <Image Include="res\ico00001.ico" />

    <Image Include="res\ico00002.ico" />

    <Image Include="res\idr_mult.ico" />

    <Image Include="res\mainfram.bmp" />

    <Image Include="res\MTerm1.ico" />

    <Image Include="res\MTerm1Doc.ico" />

    <Image Include="res\output_wnd.ico" />

    <Image Include="res\output_wnd_hc.ico" />

    <Image Include="res\properties.bmp" />

    <Image Include="res\properties_hc.bmp" />

    <Image Include="res\properties_wnd.ico" />

    <Image Include="res\properties_wnd_hc.ico" />

    <Image Include="res\sort.bmp" />

    <Image Include="res\sort_hc.bmp" />

    <Image Include="res\Toolbar.bmp" />

    <Image Include="res\Toolbar256.bmp" />

    <Image Include="res\userimages.bmp" />

    <Image Include="res\toolbar1.bmp" />

    <Image Include="res\toolbar2.bmp" />

    <Image Include="res\toolbar_.bmp" />

    <Image Include="res\toolbar_func_key.bmp" />

  </ItemGroup>

  <ItemGroup>

    <None Include="res\MTerm1.rc2" />

    <Text Include="design1.txt" />

    <Text Include="FP0Ext.cfg" />

  </ItemGroup>

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

  <ImportGroup Label="ExtensionTargets">