[Ttssh2-commit] [8565] common_static.lib の参照方法を修正

scmno****@osdn***** scmno****@osdn*****
2020年 2月 25日 (火) 23:11:33 JST


Revision: 8565
          https://osdn.net/projects/ttssh2/scm/svn/commits/8565
Author:   zmatsuo
Date:     2020-02-25 23:11:33 +0900 (Tue, 25 Feb 2020)
Log Message:
-----------
common_static.lib の参照方法を修正

- common_static.lib を複数回生成しないようにした
- common_static で生成される lib を参照
  - ttxssh
  - TTProxy
  - TTXSamples/TTXCheckUpdate
  - TTXSamples/TTXRecurringCommand
  - TTXSamples/TTXViewMode
- common_static のプロジェクトを参照(ライブラリが自動でリンクされる)
  - ttpcmn
  - ttpfile
  - ttpmacro
- common_static に static にリンクされているファイルを追加
  - dll export されているものは含まない

Modified Paths:
--------------
    trunk/TTProxy/TTProxy.sln
    trunk/TTProxy/TTProxy.v16.sln
    trunk/TTProxy/TTProxy.v16.vcxproj
    trunk/TTProxy/TTProxy.vcproj
    trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj
    trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj
    trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj
    trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
    trunk/TTXSamples/TTXSamples.sln
    trunk/TTXSamples/TTXSamples.v16.sln
    trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj
    trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj
    trunk/teraterm/common/CMakeLists.txt
    trunk/teraterm/common/common_static.v16.vcxproj
    trunk/teraterm/common/common_static.v8.vcproj
    trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj
    trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters
    trunk/teraterm/ttpcmn/ttpcmn.vcproj
    trunk/teraterm/ttpfile/ttpfile.vcproj
    trunk/teraterm/ttpmacro/CMakeLists.txt
    trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.vcproj
    trunk/ttssh2/ttxssh/CMakeLists.txt
    trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.vcproj

-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.sln
===================================================================
--- trunk/TTProxy/TTProxy.sln	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTProxy/TTProxy.sln	2020-02-25 14:11:33 UTC (rev 8565)
@@ -2,12 +2,7 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTProxy", "TTProxy.vcproj", "{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32}
-	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_static", "..\teraterm\common\common_static.v8.vcproj", "{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -18,10 +13,6 @@
 		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Debug|Win32.Build.0 = Debug|Win32
 		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.ActiveCfg = Release|Win32
 		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.Build.0 = Release|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Debug|Win32.Build.0 = Debug|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Release|Win32.ActiveCfg = Release|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/TTProxy/TTProxy.v16.sln
===================================================================
--- trunk/TTProxy/TTProxy.v16.sln	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTProxy/TTProxy.v16.sln	2020-02-25 14:11:33 UTC (rev 8565)
@@ -5,8 +5,6 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTProxy", "TTProxy.v16.vcxproj", "{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_static", "..\teraterm\common\common_static.v16.vcxproj", "{AC42387D-23EC-45DB-81F9-8933C7EFA52A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -17,10 +15,6 @@
 		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Debug|Win32.Build.0 = Debug|Win32
 		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.ActiveCfg = Release|Win32
 		{C4DE5FDF-DB00-4C73-9D4F-359BFCA3F2FB}.Release|Win32.Build.0 = Release|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Debug|Win32.Build.0 = Debug|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|Win32.ActiveCfg = Release|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/TTProxy/TTProxy.v16.vcxproj
===================================================================
--- trunk/TTProxy/TTProxy.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTProxy/TTProxy.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -84,7 +84,7 @@
       <Culture>0x0411</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
@@ -125,7 +125,7 @@
       <Culture>0x0411</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
@@ -202,11 +202,6 @@
     <ClInclude Include="YCL\include\YCL\Vector.h" />
     <ClInclude Include="YCL\include\YCL\Window.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\teraterm\common\common_static.v16.vcxproj">
-      <Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/TTProxy/TTProxy.vcproj
===================================================================
--- trunk/TTProxy/TTProxy.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTProxy/TTProxy.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
+				AdditionalDependencies="common_static.lib ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
 				OutputFile="$(OutDir)\TTXProxy.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -170,7 +170,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
+				AdditionalDependencies="common_static.lib ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
 				OutputFile="$(OutDir)\TTXProxy.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"

Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -65,7 +65,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;Wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;Wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -83,7 +83,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;Wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;Wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -110,11 +110,6 @@
   <ItemGroup>
     <ResourceCompile Include="resource.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\teraterm\common\common_static.v16.vcxproj">
-      <Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" Wininet.lib user32.lib"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" Wininet.lib user32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" Wininet.lib user32.lib"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" Wininet.lib user32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -65,7 +65,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -83,7 +83,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -109,11 +109,6 @@
     <Text Include="ReadMe-ja.txt" />
     <Text Include="ReadMe.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\teraterm\common\common_static.v16.vcxproj">
-      <Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
 				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
 				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"

Modified: trunk/TTXSamples/TTXSamples.sln
===================================================================
--- trunk/TTXSamples/TTXSamples.sln	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXSamples.sln	2020-02-25 14:11:33 UTC (rev 8565)
@@ -17,9 +17,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXKcodeChange", "TTXKcodeChange\TTXKcodeChange.vcproj", "{2E487F50-84E4-404D-A7E1-F9FA4A72BC25}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXViewMode", "TTXViewMode\TTXViewMode.vcproj", "{2296FB66-3FA4-4136-8252-ABECEEAC2D70}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCopyIniFile", "TTXCopyIniFile\TTXCopyIniFile.vcproj", "{2B2B8D6E-4A84-49DD-8291-46172FCE422A}"
 EndProject
@@ -30,9 +27,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCommandLineOpt", "TTXCommandLineOpt\TTXCommandLineOpt.vcproj", "{EE8BFC38-7000-42F1-BBC3-17F19855918A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXRecurringCommand", "TTXRecurringCommand\TTXRecurringCommand.vcproj", "{3C656364-FAEA-41D2-B227-52187D3C2529}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXShowCommandLine", "TTXShowCommandLine\TTXShowCommandLine.vcproj", "{80ED9927-27F9-473A-802C-FB10DEB5ECC6}"
 EndProject
@@ -39,12 +33,7 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXOutputBuffering", "TTXOutputBuffering\TTXOutputBuffering.vcproj", "{80BE71D1-BEA3-4A5D-8F13-362D6364892D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCheckUpdate", "TTXCheckUpdate\TTXCheckUpdate.v8.vcproj", "{937DFA65-5709-4643-B778-482C15DEC581}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32}
-	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_static", "..\teraterm\common\common_static.v8.vcproj", "{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -119,10 +108,6 @@
 		{937DFA65-5709-4643-B778-482C15DEC581}.Debug|Win32.Build.0 = Debug|Win32
 		{937DFA65-5709-4643-B778-482C15DEC581}.Release|Win32.ActiveCfg = Release|Win32
 		{937DFA65-5709-4643-B778-482C15DEC581}.Release|Win32.Build.0 = Release|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Debug|Win32.Build.0 = Debug|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Release|Win32.ActiveCfg = Release|Win32
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/TTXSamples/TTXSamples.v16.sln
===================================================================
--- trunk/TTXSamples/TTXSamples.v16.sln	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXSamples.v16.sln	2020-02-25 14:11:33 UTC (rev 8565)
@@ -36,8 +36,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TTXCheckUpdate", "TTXCheckUpdate\TTXCheckUpdate.v16.vcxproj", "{937DFA65-5709-4643-B778-482C15DEC581}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_static", "..\teraterm\common\common_static.v16.vcxproj", "{AC42387D-23EC-45DB-81F9-8933C7EFA52A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -112,10 +110,6 @@
 		{937DFA65-5709-4643-B778-482C15DEC581}.Debug|Win32.Build.0 = Debug|Win32
 		{937DFA65-5709-4643-B778-482C15DEC581}.Release|Win32.ActiveCfg = Release|Win32
 		{937DFA65-5709-4643-B778-482C15DEC581}.Release|Win32.Build.0 = Release|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Debug|Win32.Build.0 = Debug|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|Win32.ActiveCfg = Release|Win32
-		{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -65,7 +65,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -83,7 +83,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -109,11 +109,6 @@
     <Text Include="ReadMe-ja.txt" />
     <Text Include="ReadMe.txt" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\teraterm\common\common_static.v16.vcxproj">
-      <Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="2"
 				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
+				AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib ole32.lib shell32.lib gdi32.lib"
 				LinkIncremental="1"
 				DelayLoadDLLs="user32.dll"
 				GenerateDebugInformation="true"

Modified: trunk/teraterm/common/CMakeLists.txt
===================================================================
--- trunk/teraterm/common/CMakeLists.txt	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/common/CMakeLists.txt	2020-02-25 14:11:33 UTC (rev 8565)
@@ -7,11 +7,16 @@
   codeconv.h
   compat_win.cpp
   compat_win.h
+  dlglib.c
+  dlglib.h
+  dlglib_cpp.cpp
+  dlglib_tmpl.cpp
   dllutil.cpp
   dllutil.h
   getcontent.cpp
   getcontent.h
   i18n.c
+  i18n_static.c
   i18n.h
   layer_for_unicode.cpp
   layer_for_unicode.h
@@ -20,6 +25,16 @@
   tmfc.h
   tmfc_frame.cpp
   tmfc_property.cpp
+  ttlib.h
+  ttlib_static.c
+  win16api.h
+  win16api.c
+  dlglib.h
+  dlglib.c
+  dlglib_tmpl.cpp
+  dlglib_cpp.cpp
+  tipwin.h
+  tipwin.cpp
   )
 
 target_include_directories(

Modified: trunk/teraterm/common/common_static.v16.vcxproj
===================================================================
--- trunk/teraterm/common/common_static.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/common/common_static.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -131,25 +131,35 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\teraterm\teraterm\common\tmfc.cpp" />
-    <ClCompile Include="..\..\..\teraterm\teraterm\common\tmfc_frame.cpp" />
-    <ClCompile Include="..\..\..\teraterm\teraterm\common\tmfc_property.cpp" />
-    <ClCompile Include="..\common\codeconv.cpp" />
-    <ClCompile Include="..\common\compat_win.cpp" />
-    <ClCompile Include="..\common\dllutil.cpp" />
-    <ClCompile Include="..\common\i18n.c" />
+    <ClCompile Include="dlglib.c" />
+    <ClCompile Include="dlglib_cpp.cpp" />
+    <ClCompile Include="dlglib_tmpl.cpp" />
+    <ClCompile Include="tipwin.cpp" />
+    <ClCompile Include="tmfc.cpp" />
+    <ClCompile Include="tmfc_frame.cpp" />
+    <ClCompile Include="tmfc_property.cpp" />
+    <ClCompile Include="codeconv.cpp" />
+    <ClCompile Include="compat_win.cpp" />
+    <ClCompile Include="dllutil.cpp" />
     <ClCompile Include="getcontent.cpp" />
+    <ClCompile Include="i18n_static.c" />
     <ClCompile Include="layer_for_unicode.cpp" />
     <ClCompile Include="layer_for_unicode_comctl32.cpp" />
+    <ClCompile Include="ttlib_static.c" />
+    <ClCompile Include="win16api.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\teraterm\teraterm\common\tmfc.h" />
-    <ClInclude Include="..\common\compat_win.h" />
-    <ClInclude Include="..\common\dllutil.h" />
-    <ClInclude Include="..\common\i18n.h" />
+    <ClInclude Include="dlglib.h" />
+    <ClInclude Include="tipwin.h" />
+    <ClInclude Include="tmfc.h" />
+    <ClInclude Include="compat_win.h" />
+    <ClInclude Include="dllutil.h" />
+    <ClInclude Include="i18n.h" />
     <ClInclude Include="codeconv.h" />
     <ClInclude Include="getcontent.h" />
     <ClInclude Include="layer_for_unicode.h" />
+    <ClInclude Include="ttlib.h" />
+    <ClInclude Include="win16api.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: trunk/teraterm/common/common_static.v8.vcproj
===================================================================
--- trunk/teraterm/common/common_static.v8.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/common/common_static.v8.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -165,7 +165,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\common\codeconv.cpp"
+			RelativePath=".\codeconv.cpp"
 			>
 		</File>
 		<File
@@ -173,11 +173,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\common\compat_win.cpp"
+			RelativePath=".\compat_win.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\common\compat_win.h"
+			RelativePath=".\compat_win.h"
 			>
 		</File>
 		<File
@@ -185,14 +185,46 @@
 			>
 		</File>
 		<File
-			RelativePath="..\common\dllutil.cpp"
+			RelativePath=".\dlglib.c"
 			>
 		</File>
 		<File
-			RelativePath="..\common\dllutil.h"
+			RelativePath=".\dlglib.h"
 			>
 		</File>
 		<File
+			RelativePath=".\dlglib_cpp.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\dlglib_tmpl.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\dllutil.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\dlglib.h"
+			>
+		</File>
+		<File
+			RelativePath=".\dlglib_cpp.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\dlglib_tmpl.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\dllutil.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\dllutil.h"
+			>
+		</File>
+		<File
 			RelativePath=".\getcontent.cpp"
 			>
 		</File>
@@ -201,11 +233,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\common\i18n.c"
+			RelativePath=".\i18n_static.c"
 			>
 		</File>
 		<File
-			RelativePath="..\common\i18n.h"
+			RelativePath=".\i18n.h"
 			>
 		</File>
 		<File
@@ -221,6 +253,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\tipwin.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\tipwin.h"
+			>
+		</File>
+		<File
 			RelativePath=".\tmfc.cpp"
 			>
 		</File>
@@ -236,6 +276,22 @@
 			RelativePath=".\tmfc_property.cpp"
 			>
 		</File>
+		<File
+			RelativePath=".\ttlib.h"
+			>
+		</File>
+		<File
+			RelativePath=".\ttlib_static.c"
+			>
+		</File>
+		<File
+			RelativePath=".\win16api.c"
+			>
+		</File>
+		<File
+			RelativePath=".\win16api.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Modified: trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -131,6 +131,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\i18n.c" />
     <ClCompile Include="..\common\servicenames.c" />
     <ClCompile Include="..\common\ttlib.c" />
     <ClCompile Include="comportinfo.cpp" />

Modified: trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpcmn/ttpcmn.v16.vcxproj.filters	2020-02-25 14:11:33 UTC (rev 8565)
@@ -37,6 +37,9 @@
     <ClCompile Include="ttcmn_notify.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\i18n.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\i18n.h">

Modified: trunk/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpcmn/ttpcmn.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -211,6 +211,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\common\i18n.c"
+				>
+			</File>
+			<File
 				RelativePath="language.c"
 				>
 			</File>

Modified: trunk/teraterm/ttpfile/ttpfile.vcproj
===================================================================
--- trunk/teraterm/ttpfile/ttpfile.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpfile/ttpfile.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib comdlg32.lib ttpcmn.lib"
+				AdditionalDependencies="common_static.lib User32.lib gdi32.lib SHELL32.lib ole32.lib comdlg32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"
@@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib comdlg32.lib ttpcmn.lib"
+				AdditionalDependencies="common_static.lib User32.lib gdi32.lib SHELL32.lib ole32.lib comdlg32.lib ttpcmn.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(OutDir)"

Modified: trunk/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpmacro/CMakeLists.txt	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpmacro/CMakeLists.txt	2020-02-25 14:11:33 UTC (rev 8565)
@@ -102,6 +102,8 @@
 
 target_link_libraries(
   ttpmacro
+  PRIVATE
+  common_static
   ttpcmn
   ${ONIGURUMA_LIB}
   ${SFMT_LIB}

Modified: trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -198,6 +198,9 @@
     <ResourceCompile Include="ttmacro_manifest.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\common\common_static.v16.vcxproj">
+      <Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v16.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -211,4 +214,4 @@
       <UserProperties RESOURCE_FILE="ttpmacro.rc" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj.filters	2020-02-25 14:11:33 UTC (rev 8565)
@@ -43,9 +43,6 @@
     <ClCompile Include="ttmmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\common\i18n.c">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttl.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -100,6 +97,9 @@
     <ClCompile Include="..\common\dllutil.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\layer_for_unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -177,6 +177,9 @@
     <ClInclude Include="..\common\dllutil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\layer_for_unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">
@@ -193,5 +196,8 @@
     <ResourceCompile Include="ttpmacro.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="ttmacro_manifest.rc">
+      <Filter>Source Files</Filter>
+    </ResourceCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ws2_32.lib ole32.lib"
+				AdditionalDependencies="common_static.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ws2_32.lib ole32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
@@ -164,7 +164,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ws2_32.lib ole32.lib"
+				AdditionalDependencies="common_static.lib onig_sd.lib SFMTd.lib iphlpapi.lib user32.lib gdi32.lib SHELL32.lib comctl32.lib comdlg32.lib ws2_32.lib ole32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"

Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2020-02-25 14:11:33 UTC (rev 8565)
@@ -137,6 +137,8 @@
 
 target_link_libraries(
   ttxssh
+  PRIVATE
+  common_static
   libputty
   ttpcmn
   ${ZLIB_LIB}

Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -82,7 +82,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libcrypto.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;libcrypto.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libcrypto.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;libcrypto.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>

Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj	2020-02-25 14:11:17 UTC (rev 8564)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj	2020-02-25 14:11:33 UTC (rev 8565)
@@ -73,7 +73,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libcrypto.lib zlibd.lib ttpcmn.lib dnsapi.lib user32.lib gdi32.lib SHELL32.lib comdlg32.lib advapi32.lib ole32.lib comctl32.lib"
+				AdditionalDependencies="common_static.lib ws2_32.lib libcrypto.lib zlibd.lib ttpcmn.lib dnsapi.lib user32.lib gdi32.lib SHELL32.lib comdlg32.lib advapi32.lib ole32.lib comctl32.lib"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(ConfigurationName)"
@@ -170,7 +170,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libcrypto.lib zlib.lib ttpcmn.lib dnsapi.lib user32.lib gdi32.lib SHELL32.lib comdlg32.lib advapi32.lib ole32.lib comctl32.lib"
+				AdditionalDependencies="common_static.lib ws2_32.lib libcrypto.lib zlib.lib ttpcmn.lib dnsapi.lib user32.lib gdi32.lib SHELL32.lib comdlg32.lib advapi32.lib ole32.lib comctl32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(ConfigurationName)"


Ttssh2-commit メーリングリストの案内