Tera TermRevision: 9508
https://osdn.net/projects/ttssh2/scm/svn/commits/9508
Author: zmatsuo
Date: 2021-10-30 00:19:40 +0900 (Sat, 30 Oct 2021)
Log Message:
-----------
VS2022でライブラリがビルドできるようにした
- バッチ、ドキュメント調整
- r9419
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9419
Modified Paths:
--------------
trunk/doc/ja/html/reference/build_library_with_cmake.md
trunk/doc/ja/html/reference/build_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-10-29 15:19:31 UTC (rev 9507)
+++ trunk/doc/ja/html/reference/build_library_with_cmake.md 2021-10-29 15:19:40 UTC (rev 9508)
@@ -32,17 +32,19 @@
### batファイルを使用する場合
-buildall_cmake.bat を実行して使用する Visual Studioを選ぶ
+libs/buildall_cmake.bat を実行して使用する Visual Studioを選ぶ
- 1. Visual Studio 16 2019
- 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
+ 1. Visual Studio 17 2022
+ 2. Visual Studio 17 2022 x64
+ 3. Visual Studio 16 2019
+ 4. Visual Studio 16 2019 x64
+ 5. Visual Studio 15 2017
+ 6. Visual Studio 14 2015
+ 7. Visual Studio 12 2013
+ 8. Visual Studio 11 2012
+ 9. Visual Studio 10 2010
+ a. Visual Studio 9 2008
+ b. Visual Studio 8 2005
select no
VS2005を選択した場合、
@@ -76,11 +78,11 @@
- 次のフォルダにライブラリの `*.h` , `*.lib` が生成される
- `cJSON`
- - `oniguruma_{compiler}`
- - `openssl_{compiler}`
- - `putty`
- - `SFMT_{compiler}`
- - `zlib_{compiler}`
+ - `oniguruma_{compiler}`
+ - `openssl_{compiler}`
+ - `putty`
+ - `SFMT_{compiler}`
+ - `zlib_{compiler}`
## download アーカイブダウンロードフォルダ
Modified: trunk/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/ja/html/reference/build_with_cmake.md 2021-10-29 15:19:31 UTC (rev 9507)
+++ trunk/doc/ja/html/reference/build_with_cmake.md 2021-10-29 15:19:40 UTC (rev 9508)
@@ -7,8 +7,7 @@
- Visual Studio 2005 をサポートしている cmake の最後のバージョンは 3.11.4 です
- Visual Studio 2005 (Expressも含む)以外を使用する場合は特に制限はありません
-- Visual Studio 2017,2019 インストーラーで、オプションを選べば cmake をインストールできます
-- cmake 3.14から Visual Studio 2019 をサポートしています
+- Visual Studio 2017,2019,2022 インストーラーで、オプションを選べば cmake をインストールできます
## MinGW (very experimental)
Modified: trunk/libs/buildall_cmake.bat
===================================================================
--- trunk/libs/buildall_cmake.bat 2021-10-29 15:19:31 UTC (rev 9507)
+++ trunk/libs/buildall_cmake.bat 2021-10-29 15:19:40 UTC (rev 9508)
@@ -7,31 +7,35 @@
set OPT=
:retry_vs
-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)
+echo 1. Visual Studio 17 2022 Win32
+echo 2. Visual Studio 17 2022 x64
+echo 3. Visual Studio 16 2019 Win32
+echo 4. Visual Studio 16 2019 x64
+echo 5. Visual Studio 15 2017
+echo 6. Visual Studio 14 2015
+echo 7. Visual Studio 12 2013
+echo 8. Visual Studio 11 2012
+echo 9. Visual Studio 10 2010
+echo a. Visual Studio 9 2008
+echo b. Visual Studio 8 2005
+rem echo c. Visual Studio NMake (experimental)
+rem echo d. 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 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
+if "%no%" == "1" set GENERATOR="Visual Studio 17 2022" & set OPT=-DARCHITECTURE=Win32 & goto build_all
+if "%no%" == "2" set GENERATOR="Visual Studio 17 2022" & set OPT=-DARCHITECTURE=x64 & goto build_all
+if "%no%" == "3" set GENERATOR="Visual Studio 16 2019" & set OPT=-DARCHITECTURE=Win32 & goto build_all
+if "%no%" == "4" set GENERATOR="Visual Studio 16 2019" & set OPT=-DARCHITECTURE=x64 & goto build_all
+if "%no%" == "5" set GENERATOR="Visual Studio 15 2017" & goto build_all
+if "%no%" == "6" set GENERATOR="Visual Studio 14 2015" & goto build_all
+if "%no%" == "7" set GENERATOR="Visual Studio 12 2013" & goto build_all
+if "%no%" == "8" set GENERATOR="Visual Studio 11 2012" & goto build_all
+if "%no%" == "9" set GENERATOR="Visual Studio 10 2010" & goto build_all
+if "%no%" == "a" set GENERATOR="Visual Studio 9 2008" & goto build_all
+if "%no%" == "b" set GENERATOR="Visual Studio 8 2005" & call :cmake_3_11_4 & goto build_all_2
+if "%no%" == "c" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
+if "%no%" == "d" set GENERATOR="Unix Makefiles" & set OPT=-DCMAKE_TOOLCHAIN_FILE=../mingw.toolchain.cmake & goto build_all
echo ? retry
goto retry_vs