Tera TermRevision: 7429
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7429
Author: doda
Date: 2019-02-15 21:21:06 +0900 (Fri, 15 Feb 2019)
Log Message:
-----------
error LNK2005 で ttpmacro がビルド出来なくなったのに対処。
c.f. [Ttssh2-devel 3601], r5709
Revision Links:
--------------
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5709
Modified Paths:
--------------
trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj
trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj
trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj
trunk/teraterm/ttpmacro/ttpmacro.vcproj
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2019-02-10 16:29:09 UTC (rev 7428)
+++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2019-02-15 12:21:06 UTC (rev 7429)
@@ -78,7 +78,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -85,6 +85,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -114,7 +115,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -121,6 +122,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2019-02-10 16:29:09 UTC (rev 7428)
+++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2019-02-15 12:21:06 UTC (rev 7429)
@@ -79,7 +79,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;SFMT.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -86,6 +86,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -114,7 +115,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;SFMTd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>iphlpapi.dll;user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -121,6 +122,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
+ <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj 2019-02-10 16:29:09 UTC (rev 7428)
+++ trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj 2019-02-15 12:21:06 UTC (rev 7429)
@@ -73,10 +73,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_s.lib SFMT.lib iphlpapi.lib"
+ AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+ IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
DelayLoadDLLs="iphlpapi.dll;user32.dll"
GenerateDebugInformation="true"
SubSystem="2"
@@ -161,10 +162,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_sd.lib SFMTd.lib iphlpapi.lib"
+ AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+ IgnoreDefaultLibraryNames="nafxcwd.lib;LIBCMTD.lib"
DelayLoadDLLs="iphlpapi.dll;user32.dll"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj 2019-02-10 16:29:09 UTC (rev 7428)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj 2019-02-15 12:21:06 UTC (rev 7429)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="shift_jis"?>
+
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
@@ -72,10 +73,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_s.lib SFMT.lib iphlpapi.lib"
+ AdditionalDependencies="nafxcw.lib LIBCMT.lib onig_s.lib SFMT.lib iphlpapi.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+ IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
DelayLoadDLLs="iphlpapi.dll;user32.dll"
GenerateDebugInformation="true"
SubSystem="2"
@@ -161,10 +163,11 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="onig_sd.lib SFMTd.lib iphlpapi.lib"
+ AdditionalDependencies="nafxcwd.lib LIBCMTD.lib onig_sd.lib SFMTd.lib iphlpapi.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)..\libs\SFMT;$(OutDir)"
+ IgnoreDefaultLibraryNames="nafxcw.lib;LIBCMT.lib"
DelayLoadDLLs="iphlpapi.dll;user32.dll"
GenerateDebugInformation="true"
SubSystem="2"