Tera TermRevision: 7547
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7547
Author: yutakapon
Date: 2019-04-04 21:29:00 +0900 (Thu, 04 Apr 2019)
Log Message:
-----------
Visual Studio 2019のサポートを追加した(*.v16.slnと*.v16.vcxprojは未)。
バージョン情報にはVC++16.0と表記される。
v142_xpの存在を確認できなかったため、未記載とした。
Modified Paths:
--------------
trunk/doc/en/html/reference/develop.txt
trunk/doc/ja/html/reference/develop.txt
trunk/installer/build.bat
trunk/teraterm/ttpdlg/ttdlg.c
-------------- next part --------------
Modified: trunk/doc/en/html/reference/develop.txt
===================================================================
--- trunk/doc/en/html/reference/develop.txt 2019-04-02 16:27:06 UTC (rev 7546)
+++ trunk/doc/en/html/reference/develop.txt 2019-04-04 12:29:00 UTC (rev 7547)
@@ -23,6 +23,8 @@
Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
-- Visual Studio Community 2017
Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
+-- Visual Studio Community 2019
+ Note: The executable program which was compiled by this version does not work on Windows Vista, XP, 2000, NT 4.0, 95, 98 and Me.
- How to build with batch file
Please execute the batch file on command prompt of Visual Studio. Otherwise, please configure below environment variables.
Please call "(x86) Native Tools Command Prompt" of your Visual Studio to register new PATH regarding the compiler path and VSINSTALLDIR variable.
Modified: trunk/doc/ja/html/reference/develop.txt
===================================================================
--- trunk/doc/ja/html/reference/develop.txt 2019-04-02 16:27:06 UTC (rev 7546)
+++ trunk/doc/ja/html/reference/develop.txt 2019-04-04 12:29:00 UTC (rev 7547)
@@ -27,6 +27,8 @@
-- Visual Studio Community 2017
\x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
Windows Vista, XP \x82\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82\xE9\x82ɂ\xCD v141_xp \x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+-- Visual Studio Community 2019
+ \x92\x8D: \x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB3\x82ꂽ\x8E\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xCD Windows Vista, XP, 2000, NT 4.0, 95, 98, Me \x82œ\xAE\x82\xAB\x82܂\xB9\x82\xF1\x81B
- \x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83r\x83\x8B\x83h\x82\xB7\x82邽\x82߂\xC9
Visual Studio \x82̃R\x83}\x83\x93\x83h\x83v\x83\x8D\x83\x93\x83v\x83g\x82\xA9\x82\xE7\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82邩\x81A\x88ȉ\xBA\x82̂悤\x82Ɋ\xAB\x95ϐ\x94\x82\xF0\x90ݒ肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
\x8Eg\x97p\x82\xB5\x82\xBD\x82\xA2\x83o\x81[\x83W\x83\x87\x83\x93\x82\xCC Visual Studio \x82\xCC "(x86) Native Tools Command Prompt" \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x81A\x83R\x83\x93\x83p\x83C\x83\x89\x82̃p\x83X\x82ɊW\x82\xB7\x82\xE9 PATH \x82\xC6 VSINSTALLDIR \x95ϐ\x94\x82\xF0\x8A\xAB\x95ϐ\x94\x82ɓo\x98^\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
Modified: trunk/installer/build.bat
===================================================================
--- trunk/installer/build.bat 2019-04-02 16:27:06 UTC (rev 7546)
+++ trunk/installer/build.bat 2019-04-04 12:29:00 UTC (rev 7547)
@@ -37,11 +37,17 @@
goto vs2015
:check_2017
-if "%VS150COMNTOOLS%" == "" goto novs
-if not exist "%VS150COMNTOOLS%\VsDevCmd.bat" goto novs
+if "%VS150COMNTOOLS%" == "" goto check_2019
+if not exist "%VS150COMNTOOLS%\VsDevCmd.bat" goto check_2019
call "%VS150COMNTOOLS%\VsDevCmd.bat"
goto vs2017
+:check_2019
+if "%VS160COMNTOOLS%" == "" goto novs
+if not exist "%VS160COMNTOOLS%\VsDevCmd.bat" goto novs
+call "%VS160COMNTOOLS%\VsDevCmd.bat"
+goto vs2019
+
:novs
echo "Can't find Visual Studio"
exit /b
@@ -58,6 +64,7 @@
if /I %VSCMNDIR% EQU "%VS120COMNTOOLS%" goto vs2013
if /I %VSCMNDIR% EQU "%VS140COMNTOOLS%" goto vs2015
if /I %VSCMNDIR% EQU "%VS150COMNTOOLS%" goto vs2017
+if /I %VSCMNDIR% EQU "%VS160COMNTOOLS%" goto vs2019
echo Unknown Visual Studio version
exit /b
@@ -125,6 +132,15 @@
set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v15.sln
goto vsend
+:vs2019
+set TERATERMSLN=..\teraterm\ttermpro.v16.sln
+set TTSSHSLN=..\ttssh2\ttssh.v16.sln
+set TTPROXYSLN=..\TTProxy\TTProxy.v16.sln
+set TTXKANJISLN=..\TTXKanjiMenu\ttxkanjimenu.v16.sln
+set TTPMENUSLN=..\ttpmenu\ttpmenu.v16.sln
+set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v16.sln
+goto vsend
+
:vsend
set BUILD=build
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2019-04-02 16:27:06 UTC (rev 7546)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2019-04-04 12:29:00 UTC (rev 7547)
@@ -2161,10 +2161,11 @@
// 1912 = VS2017 update5(VC++15)
// 1913 = VS2017 update6(VC++15)
// 1914 = VS2017 15.7(VC++15)
+ // 1920 = VS2019 16.0.0(VC++16)
// VS2017 Update3\x82\xA9\x82琻\x95i\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA3\x8C\x85\x95\\x8BL(15.x.x)\x82ɂȂ\xE8\x81A
// _MSC_FULL_VER\x82\xA9\x82\xE7\x8EZ\x8Fo\x82ł\xAB\x82Ȃ\xAD\x82Ȃ\xC1\x82\xBD\x82\xBD\x82߁A\x88ꗥ\x82\xC515.0\x82Ƃ\xB7\x82\xE9\x81B
if (msc_low_ver >= 10) {
- vs_ver = msc_ver - 4;
+ vs_ver = msc_ver - 4 + (msc_low_ver - 10)/10;
msc_low_ver = 0;
}
else {