svnno****@sourc*****
svnno****@sourc*****
2016年 4月 10日 (日) 15:30:48 JST
Tera TermRevision: 6367
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6367
Author: maya
Date: 2016-04-10 15:30:47 +0900 (Sun, 10 Apr 2016)
Log Message:
-----------
リンカがマニフェストを生成するのを抑止する
teraterm.manifest と、自動生成される ttermpro.exe.intermediate.manifest を両方埋め込もうとすると
manifest authoring warning 81010002: Unrecognized Element "compatibility" in namespace "urn:schemas-microsoft-com:compatibility.v1"
が発生するため
Modified Paths:
--------------
trunk/teraterm/teraterm/ttermpro.v10.vcxproj
trunk/teraterm/teraterm/ttermpro.v11.vcxproj
trunk/teraterm/teraterm/ttermpro.v12.vcxproj
trunk/teraterm/teraterm/ttermpro.v14.vcxproj
trunk/teraterm/teraterm/ttermpro.v9.vcproj
trunk/teraterm/teraterm/ttermpro.vcproj
-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v10.vcxproj 2016-04-09 14:41:26 UTC (rev 6366)
+++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj 2016-04-10 06:30:47 UTC (rev 6367)
@@ -44,9 +44,11 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v11.vcxproj 2016-04-09 14:41:26 UTC (rev 6366)
+++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj 2016-04-10 06:30:47 UTC (rev 6367)
@@ -44,11 +44,13 @@
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v12.vcxproj 2016-04-09 14:41:26 UTC (rev 6366)
+++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj 2016-04-10 06:30:47 UTC (rev 6367)
@@ -44,11 +44,13 @@
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v14.vcxproj 2016-04-09 14:41:26 UTC (rev 6366)
+++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj 2016-04-10 06:30:47 UTC (rev 6367)
@@ -44,11 +44,13 @@
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
+ <GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
Modified: trunk/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v9.vcproj 2016-04-09 14:41:26 UTC (rev 6366)
+++ trunk/teraterm/teraterm/ttermpro.v9.vcproj 2016-04-10 06:30:47 UTC (rev 6367)
@@ -76,6 +76,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
+ GenerateManifest="false"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
SubSystem="2"
@@ -166,6 +167,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
+ GenerateManifest="false"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj 2016-04-09 14:41:26 UTC (rev 6366)
+++ trunk/teraterm/teraterm/ttermpro.vcproj 2016-04-10 06:30:47 UTC (rev 6367)
@@ -75,6 +75,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
+ GenerateManifest="false"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
SubSystem="2"
@@ -166,6 +167,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
+ GenerateManifest="false"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
SubSystem="2"