Tera TermRevision: 9156
https://osdn.net/projects/ttssh2/scm/svn/commits/9156
Author: zmatsuo
Date: 2021-02-16 00:02:42 +0900 (Tue, 16 Feb 2021)
Log Message:
-----------
ライブラリのビルドに Visual Studio 16 2019 x64 を追加
- 併せてドキュメントを修正(日本語のみ)
Modified Paths:
--------------
trunk/doc/ja/html/reference/build_library_with_cmake.md
trunk/libs/buildall_cmake.bat
-------------- next part --------------
Modified: trunk/doc/ja/html/reference/build_library_with_cmake.md
===================================================================
--- trunk/doc/ja/html/reference/build_library_with_cmake.md 2021-02-15 15:02:33 UTC (rev 9155)
+++ trunk/doc/ja/html/reference/build_library_with_cmake.md 2021-02-15 15:02:42 UTC (rev 9156)
@@ -35,18 +35,19 @@
buildall_cmake.bat を実行して使用する Visual Studioを選ぶ
1. Visual Studio 16 2019
- 2. Visual Studio 15 2017
- 3. Visual Studio 14 2015
- 4. Visual Studio 12 2013
- 5. Visual Studio 11 2012
- 6. Visual Studio 10 2010
- 7. Visual Studio 9 2008
- 8. Visual Studio 8 2005
+ 2. Visual Studio 16 2019 x64
+ 3. Visual Studio 15 2017
+ 4. Visual Studio 14 2015
+ 5. Visual Studio 12 2013
+ 6. Visual Studio 11 2012
+ 7. Visual Studio 10 2010
+ 8. Visual Studio 9 2008
+ 9. Visual Studio 8 2005
select no
VS2005を選択した場合、
-このバッチファイルから cmake 3.11.4 をダウンロードして `libs\cmake-3.11.4-win32-x86` に
-インストールできます。
+このバッチファイルから cmake 3.11.4 をダウンロードして `buildtools\libs\cmake-3.11.4-win32-x86` に
+展開されます。
### cmakeを使用する場合
@@ -54,18 +55,14 @@
cmake -DCMAKE_GENERATOR="Visual Studio 16 2019" -DARCHITECTURE=Win32 -P buildall.cmake
-Visual Studio 2017 x86 の場合
+Visual Studio 2019 x64 の場合
- cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P buildall.cmake
+ cmake -DCMAKE_GENERATOR="Visual Studio 15 2019" -DARCHITECTURE=x64 -P buildall.cmake`
-Visual Studio 2017 x64 の場合
-
- cmake -DCMAKE_GENERATOR="Visual Studio 15 2017 Win64" -P buildall.cmake`
-
Visual Studio 2005の場合は、cmakeのバージョン3.11.4以前を使用
-(cmake が libs\cmake-3.11.4-win32-x86 にインストールしてある場合)
+(cmake が buildtools\cmake-3.11.4-win32-x86 にインストールしてある場合)
- libs\cmake-3.11.4-win32-x86\bin\cmake.exe" -DCMAKE_GENERATOR="Visual Studio 8 2005" -P buildall.cmake
+ ..\buildtools\cmake-3.11.4-win32-x86\bin\cmake.exe" -DCMAKE_GENERATOR="Visual Studio 8 2005" -P buildall.cmake
## MinGW 共通
@@ -78,6 +75,7 @@
## 生成されるライブラリフォルダ
- 次のフォルダにライブラリの `*.h` , `*.lib` が生成される
+ - `cJSON`
- `oniguruma_{compiler}`
- `openssl_{compiler}`
- `putty`
Modified: trunk/libs/buildall_cmake.bat
===================================================================
--- trunk/libs/buildall_cmake.bat 2021-02-15 15:02:33 UTC (rev 9155)
+++ trunk/libs/buildall_cmake.bat 2021-02-15 15:02:42 UTC (rev 9156)
@@ -7,28 +7,30 @@
set OPT=
:retry_vs
-echo 1. Visual Studio 16 2019
-echo 2. Visual Studio 15 2017
-echo 3. Visual Studio 14 2015
-echo 4. Visual Studio 12 2013
-echo 5. Visual Studio 11 2012
-echo 6. Visual Studio 10 2010
-echo 7. Visual Studio 9 2008
-echo 8. Visual Studio 8 2005
-rem echo 9. Visual Studio NMake (experimental)
-rem echo z. Cygwin MinGW Release + Unix Makefiles (experimental)
+echo 1. Visual Studio 16 2019 Win32
+echo 2. Visual Studio 16 2019 x64
+echo 3. Visual Studio 15 2017
+echo 4. Visual Studio 14 2015
+echo 5. Visual Studio 12 2013
+echo 6. Visual Studio 11 2012
+echo 7. Visual Studio 10 2010
+echo 8. Visual Studio 9 2008
+echo 9. Visual Studio 8 2005
+rem echo a. Visual Studio NMake (experimental)
+rem echo b. Cygwin MinGW Release + Unix Makefiles (experimental)
set /p no="select no "
echo %no%
if "%no%" == "1" set GENERATOR="Visual Studio 16 2019" & set OPT=-DARCHITECTURE=Win32 & goto build_all
-if "%no%" == "2" set GENERATOR="Visual Studio 15 2017" & goto build_all
-if "%no%" == "3" set GENERATOR="Visual Studio 14 2015" & goto build_all
-if "%no%" == "4" set GENERATOR="Visual Studio 12 2013" & goto build_all
-if "%no%" == "5" set GENERATOR="Visual Studio 11 2012" & goto build_all
-if "%no%" == "6" set GENERATOR="Visual Studio 10 2010" & goto build_all
-if "%no%" == "7" set GENERATOR="Visual Studio 9 2008" & goto build_all
-if "%no%" == "8" set GENERATOR="Visual Studio 8 2005" & call :cmake_3_11_4 & goto build_all_2
-if "%no%" == "9" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
+if "%no%" == "2" set GENERATOR="Visual Studio 16 2019" & set OPT=-DARCHITECTURE=x64 & goto build_all
+if "%no%" == "3" set GENERATOR="Visual Studio 15 2017" & goto build_all
+if "%no%" == "4" set GENERATOR="Visual Studio 14 2015" & goto build_all
+if "%no%" == "5" set GENERATOR="Visual Studio 12 2013" & goto build_all
+if "%no%" == "6" set GENERATOR="Visual Studio 11 2012" & goto build_all
+if "%no%" == "7" set GENERATOR="Visual Studio 10 2010" & goto build_all
+if "%no%" == "8" set GENERATOR="Visual Studio 9 2008" & goto build_all
+if "%no%" == "9" set GENERATOR="Visual Studio 8 2005" & call :cmake_3_11_4 & goto build_all_2
+if "%no%" == "a" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
if "%no%" == "z" set GENERATOR="Unix Makefiles" & set OPT=-DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake & goto build_all
echo ? retry
goto retry_vs