svnno****@sourc*****
svnno****@sourc*****
2014年 11月 19日 (水) 23:54:47 JST
Tera TermRevision: 5705
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5705
Author: maya
Date: 2014-11-19 23:54:47 +0900 (Wed, 19 Nov 2014)
Log Message:
-----------
r5701 では不足だったぶん
vcproj を整理
Revision Links:
--------------
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5701
Modified Paths:
--------------
trunk/TTProxy/TTProxy.vcproj
trunk/teraterm/teraterm/ttermpro.vcproj
trunk/teraterm/ttpcmn/ttpcmn.vcproj
trunk/teraterm/ttpdlg/ttpdlg.vcproj
trunk/teraterm/ttpfile/ttpfile.vcproj
trunk/teraterm/ttpset/ttpset.vcproj
trunk/teraterm/ttptek/ttptek.vcproj
trunk/ttssh2/matcher/matcher.vcproj
trunk/ttssh2/ttxssh/ttxssh.vcproj
-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.vcproj
===================================================================
--- trunk/TTProxy/TTProxy.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/TTProxy/TTProxy.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -80,7 +80,6 @@
ModuleDefinitionFile="TTX.def"
GenerateDebugInformation="true"
GenerateMapFile="true"
- MapFileName="$(OutDir)\$(ProjectName).map"
ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/teraterm/teraterm/ttermpro.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -48,7 +48,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
Optimization="0"
- AdditionalIncludeDirectories="..\common;..\ttpfile"
+ AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="1"
BrowseInformation="0"
@@ -64,7 +64,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1041"
- AdditionalIncludeDirectories="..\common"
+ AdditionalIncludeDirectories="$(SolutionDir)common"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -74,7 +74,7 @@
AdditionalDependencies="ws2_32.lib imm32.lib imagehlp.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\debug"
+ AdditionalLibraryDirectories="$(OutDir)"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
SubSystem="2"
@@ -139,7 +139,7 @@
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\common;..\ttpfile"
+ AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
@@ -155,7 +155,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="..\common"
+ AdditionalIncludeDirectories="$(SolutionDir)common"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -165,7 +165,7 @@
AdditionalDependencies="ws2_32.lib imm32.lib imagehlp.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\release"
+ AdditionalLibraryDirectories="$(OutDir)"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
SubSystem="2"
Modified: trunk/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/teraterm/ttpcmn/ttpcmn.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -74,11 +74,11 @@
AdditionalDependencies="setupapi.lib htmlhelp.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
- ModuleDefinitionFile=".\ttpcmn.def"
+ ModuleDefinitionFile="$(ProjectName).def"
DelayLoadDLLs="setupapi.dll; user32.dll"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpcmn.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -165,11 +165,11 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)htmlhelp"
- ModuleDefinitionFile=".\ttpcmn.def"
+ ModuleDefinitionFile="$(ProjectName).def"
DelayLoadDLLs="setupapi.dll;user32.dll"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpcmn.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/teraterm/ttpdlg/ttpdlg.vcproj
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/teraterm/ttpdlg/ttpdlg.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -76,10 +76,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma;$(OutDir)"
- ModuleDefinitionFile=".\ttpdlg.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpdlg.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -167,10 +167,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma;$(OutDir)"
- ModuleDefinitionFile=".\ttpdlg.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpdlg.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/teraterm/ttpfile/ttpfile.vcproj
===================================================================
--- trunk/teraterm/ttpfile/ttpfile.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/teraterm/ttpfile/ttpfile.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -75,10 +75,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
- ModuleDefinitionFile=".\ttpfile.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpfile.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -165,10 +165,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
- ModuleDefinitionFile=".\ttpfile.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpfile.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/teraterm/ttpset/ttpset.vcproj
===================================================================
--- trunk/teraterm/ttpset/ttpset.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/teraterm/ttpset/ttpset.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -74,10 +74,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
- ModuleDefinitionFile=".\ttpset.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpset.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -166,10 +166,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
- ModuleDefinitionFile=".\ttpset.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttpset.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/teraterm/ttptek/ttptek.vcproj
===================================================================
--- trunk/teraterm/ttptek/ttptek.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/teraterm/ttptek/ttptek.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -73,10 +73,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
- ModuleDefinitionFile=".\ttptek.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttptek.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -165,10 +165,10 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
- ModuleDefinitionFile=".\ttptek.def"
+ ModuleDefinitionFile="$(ProjectName).def"
GenerateDebugInformation="true"
SubSystem="2"
- ImportLibrary="$(OutDir)\ttptek.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
Modified: trunk/ttssh2/matcher/matcher.vcproj
===================================================================
--- trunk/ttssh2/matcher/matcher.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/ttssh2/matcher/matcher.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -64,7 +64,6 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
SuppressStartupBanner="true"
SubSystem="1"
@@ -143,7 +142,6 @@
/>
<Tool
Name="VCLinkerTool"
- OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj 2014-11-19 13:13:18 UTC (rev 5704)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj 2014-11-19 14:54:47 UTC (rev 5705)
@@ -16,8 +16,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -41,22 +41,17 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Debug/ttxssh.tlb"
+ TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE"
"
Optimization="0"
- AdditionalIncludeDirectories="..\..\teraterm\common;..\..\libs\openssl\inc32;..\..\teraterm\teraterm;..\..\libs\zlib;..\matcher;..\putty"
+ AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\inc32;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRTDBG_MAP_ALLOC"
RuntimeLibrary="1"
EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Debug/ttxssh.pch"
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
BrowseInformation="1"
WarningLevel="3"
WarnAsError="false"
@@ -79,18 +74,16 @@
Name="VCLinkerTool"
AdditionalOptions="Version.lib 

"
AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlibd.lib ttpcmn.lib dnsapi.lib"
- OutputFile=".\Debug/ttxssh.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\libs\openssl\out32.dbg;..\..\libs\zlib;..\..\teraterm\Debug"
- ModuleDefinitionFile="ttxssh.def"
+ AdditionalLibraryDirectories="$(SolutionDir)..\libs\openssl\out32.dbg;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(ConfigurationName)"
+ ModuleDefinitionFile="$(ProjectName).def"
DelayLoadDLLs="dnsapi.dll"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/ttxssh.pdb"
GenerateMapFile="true"
SubSystem="2"
BaseAddress="0x12500000"
- ImportLibrary=".\Debug/ttxssh.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool
@@ -120,8 +113,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
@@ -145,7 +138,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/ttxssh.tlb"
+ TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
HeaderFileName=""
/>
<Tool
@@ -153,17 +146,11 @@
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE" 
"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\..\teraterm\common;..\..\libs\openssl\inc32;..\..\teraterm\teraterm;..\..\libs\zlib;..\matcher;..\putty"
+ AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\common;$(SolutionDir)..\libs\openssl\inc32;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\zlib;$(SolutionDir)matcher;$(SolutionDir)putty"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- PrecompiledHeaderFile=".\Release/ttxssh.pch"
- AssemblerOutput="2"
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -184,17 +171,15 @@
Name="VCLinkerTool"
AdditionalOptions="Version.lib 
"
AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib libeay32.lib zlib.lib ttpcmn.lib dnsapi.lib"
- OutputFile=".\Release/ttxssh.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\libs\openssl\out32;..\..\libs\zlib;..\..\teraterm\Release"
- ModuleDefinitionFile="ttxssh.def"
+ AdditionalLibraryDirectories="$(SolutionDir)..\libs\openssl\out32;$(SolutionDir)..\libs\zlib;$(SolutionDir)..\teraterm\$(ConfigurationName)"
+ ModuleDefinitionFile="$(ProjectName).def"
DelayLoadDLLs="dnsapi.dll"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Release/ttxssh.pdb"
SubSystem="2"
BaseAddress="0x12500000"
- ImportLibrary=".\Release/ttxssh.lib"
+ ImportLibrary="$(OutDir)\$(ProjectName).lib"
TargetMachine="1"
/>
<Tool