svnno****@sourc*****
svnno****@sourc*****
2017年 7月 5日 (水) 00:02:09 JST
Revision: 6839 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6839 Author: doda Date: 2017-07-05 00:02:09 +0900 (Wed, 05 Jul 2017) Log Message: ----------- バージョン番号の文字列化を tt-version.h で定義したマクロを使うようにした Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh-version.h trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj trunk/ttssh2/ttxssh/ttxssh.v9.vcproj trunk/ttssh2/ttxssh/ttxssh.vcproj -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh-version.h =================================================================== --- trunk/ttssh2/ttxssh/ttxssh-version.h 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh-version.h 2017-07-04 15:02:09 UTC (rev 6839) @@ -28,9 +28,9 @@ #pragma once +#include "tt-version.h" + #define TTSSH_VERSION_MAJOR 2 #define TTSSH_VERSION_MINOR 81 -#define TTSSH_TOSTR(x) TTSSH_TOSTR2(x) -#define TTSSH_TOSTR2(x) #x -#define TTSSH_VERSION_STR(sep) TTSSH_TOSTR(TTSSH_VERSION_MAJOR) sep TTSSH_TOSTR(TTSSH_VERSION_MINOR) +#define TTSSH_VERSION_STR(sep) TT_TOSTR(TTSSH_VERSION_MAJOR) sep TT_TOSTR(TTSSH_VERSION_MINOR) #define TTSSH_RES_VERSION_STR TTSSH_VERSION_STR(", ") ", 0, 0" Modified: trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -73,6 +73,7 @@ <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -118,6 +119,7 @@ <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -78,6 +78,7 @@ <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -123,6 +124,7 @@ <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -78,6 +78,7 @@ <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -123,6 +124,7 @@ <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -78,6 +78,7 @@ <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -123,6 +124,7 @@ <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -78,6 +78,7 @@ <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlibd.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -123,6 +124,7 @@ <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;zlib.lib;ttpcmn.lib;dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> Modified: trunk/ttssh2/ttxssh/ttxssh.v9.vcproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.v9.vcproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.v9.vcproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -67,6 +67,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" + AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\common" /> <Tool Name="VCPreLinkEventTool" @@ -162,6 +163,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\common" /> <Tool Name="VCPreLinkEventTool" Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.vcproj 2017-07-04 15:02:02 UTC (rev 6838) +++ trunk/ttssh2/ttxssh/ttxssh.vcproj 2017-07-04 15:02:09 UTC (rev 6839) @@ -66,6 +66,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" + AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\common" /> <Tool Name="VCPreLinkEventTool" @@ -162,6 +163,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" + AdditionalIncludeDirectories="$(SolutionDir)..\teraterm\common" /> <Tool Name="VCPreLinkEventTool"