From fb4e78e1b294e8b8e6f7501d5280bdc11c3a1134 Mon Sep 17 00:00:00 2001
From: zmatsuo <6488847+zmatsuo@users.noreply.github.com>
Date: Sun, 15 Nov 2026 00:41:03 +0900
Subject: [PATCH 1/2] =?UTF-8?q?zlib=201.4=20=E3=81=AE=E3=83=A9=E3=82=A4?=
=?UTF-8?q?=E3=83=96=E3=83=A9=E3=83=AA=E5=90=8D=E3=81=AE=E5=A4=89=E6=9B=B4?=
=?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=20#1619?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- zs.lib, zsd.lib を libzs.lib, libzsd.lib に変更
---
libs/lib_zlib.cmake | 6 +++---
ttssh2/ttxssh/ttxssh.v16.vcxproj | 12 ++++++------
ttssh2/ttxssh/ttxssh.v17.vcxproj | 12 ++++++------
ttssh2/ttxssh/ttxssh.v18.vcxproj | 12 ++++++------
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/libs/lib_zlib.cmake b/libs/lib_zlib.cmake
index 80a112d18f..602a2856f2 100644
--- a/libs/lib_zlib.cmake
+++ b/libs/lib_zlib.cmake
@@ -14,10 +14,10 @@ if(MINGW)
else()
if(IS_MULTI_CONFIG)
set(ZLIB_LIB
- debug ${ZLIB_LIBRARY_DIRS}/zsd.lib
- optimized ${ZLIB_LIBRARY_DIRS}/zs.lib
+ debug ${ZLIB_LIBRARY_DIRS}/libzsd.lib
+ optimized ${ZLIB_LIBRARY_DIRS}/libzs.lib
)
else()
- set(ZLIB_LIB ${ZLIB_LIBRARY_DIRS}/zs.lib)
+ set(ZLIB_LIB ${ZLIB_LIBRARY_DIRS}/libzs.lib)
endif()
endif()
diff --git a/ttssh2/ttxssh/ttxssh.v16.vcxproj b/ttssh2/ttxssh/ttxssh.v16.vcxproj
index 72f3ff3359..7af3608624 100644
--- a/ttssh2/ttxssh/ttxssh.v16.vcxproj
+++ b/ttssh2/ttxssh/ttxssh.v16.vcxproj
@@ -149,7 +149,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -194,7 +194,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -237,7 +237,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -280,7 +280,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -322,7 +322,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -362,7 +362,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
diff --git a/ttssh2/ttxssh/ttxssh.v17.vcxproj b/ttssh2/ttxssh/ttxssh.v17.vcxproj
index 13785aa85c..47ccc2bef9 100644
--- a/ttssh2/ttxssh/ttxssh.v17.vcxproj
+++ b/ttssh2/ttxssh/ttxssh.v17.vcxproj
@@ -149,7 +149,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -194,7 +194,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -237,7 +237,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -280,7 +280,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -322,7 +322,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -362,7 +362,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
diff --git a/ttssh2/ttxssh/ttxssh.v18.vcxproj b/ttssh2/ttxssh/ttxssh.v18.vcxproj
index fa569a8ab6..cf0c962154 100644
--- a/ttssh2/ttxssh/ttxssh.v18.vcxproj
+++ b/ttssh2/ttxssh/ttxssh.v18.vcxproj
@@ -149,7 +149,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -194,7 +194,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -237,7 +237,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzsd.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -280,7 +280,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -322,7 +322,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
@@ -362,7 +362,7 @@
$(SolutionDir)..\teraterm\common;%(AdditionalIncludeDirectories)
- common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;zs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
+ common_static.lib;ws2_32.lib;crypto.lib;Bcrypt.lib;libzs.lib;ttpcmn.lib;dnsapi.lib;comctl32.lib;setupapi.lib;crypt32.lib;%(AdditionalDependencies)
true
$(SolutionDir)..\libs\libressl\build\$(Platform)\crypto\$(Configuration);$(SolutionDir)..\libs\zlib\build\$(Platform)\$(Configuration);$(SolutionDir)..\teraterm\$(Configuration).$(Platform);%(AdditionalLibraryDirectories)
$(ProjectName).def
From 56530c85bc88224e15008c96eedf4f1e36d1e5c3 Mon Sep 17 00:00:00 2001
From: zmatsuo <6488847+zmatsuo@users.noreply.github.com>
Date: Sun, 15 Nov 2026 00:41:03 +0900
Subject: [PATCH 2/2] =?UTF-8?q?buildall.cmake=20=E3=81=A7=E3=83=93?=
=?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=97=E3=81=9F?=
=?UTF-8?q?=E3=82=89=E5=81=9C=E6=AD=A2=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
=?UTF-8?q?=E5=A4=89=E6=9B=B4=20#1619?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- libs/buildall.cmake
- ライブラリのビルドに失敗したら停止するよう変更
- build_library() を追加
---
libs/buildall.cmake | 57 ++++++++++++++++++++-------------------------
1 file changed, 25 insertions(+), 32 deletions(-)
diff --git a/libs/buildall.cmake b/libs/buildall.cmake
index a258007ae5..036831e515 100644
--- a/libs/buildall.cmake
+++ b/libs/buildall.cmake
@@ -42,46 +42,39 @@ set(ARCHITECTURE_OPTION -DARCHITECTURE=${ARCHITECTURE})
include(${CMAKE_CURRENT_LIST_DIR}/../buildtools/checkperl.cmake)
message("perl=${PERL}")
+# ライブラリを1つビルドする, 失敗したら停止する
+# NAME 表示用のライブラリ名
+# ARGN cmake に渡す引数
+function(build_library NAME)
+ message("${NAME}")
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} ${ARGN}
+ RESULT_VARIABLE rv
+ )
+ if(NOT rv STREQUAL "0")
+ message(FATAL_ERROR "${NAME} build fail ${rv}")
+ endif()
+endfunction()
+
+set(GENERATOR_OPTION
+ -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION})
+
# build
-message("oniguruma")
-execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildoniguruma.cmake
- )
-message("zlib")
-execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildzlib.cmake
- )
-message("SFMT")
-execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildsfmt.cmake
- )
+build_library("oniguruma" ${GENERATOR_OPTION} -P buildoniguruma.cmake)
+build_library("zlib" ${GENERATOR_OPTION} -P buildzlib.cmake)
+build_library("SFMT" ${GENERATOR_OPTION} -P buildsfmt.cmake)
if(BUILD_SSL_LIBRARY)
if(BUILD_OPENSSL1)
- message("openssl 1.1")
- execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P openssl11.cmake
- )
+ build_library("openssl 1.1" ${GENERATOR_OPTION} -P openssl11.cmake)
endif(BUILD_OPENSSL1)
if(BUILD_OPENSSL3)
- message("openssl 3")
- execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P openssl3.cmake
- )
+ build_library("openssl 3" ${GENERATOR_OPTION} -P openssl3.cmake)
endif(BUILD_OPENSSL3)
endif(BUILD_SSL_LIBRARY)
-message("cJSON")
-execute_process(
- COMMAND ${CMAKE_COMMAND} -P buildcjson.cmake
- )
-message("argon2")
-execute_process(
- COMMAND ${CMAKE_COMMAND} -P buildargon2.cmake
- )
+build_library("cJSON" -P buildcjson.cmake)
+build_library("argon2" -P buildargon2.cmake)
if(BUILD_SSL_LIBRARY)
- message("libressl")
- execute_process(
- COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} ${ARCHITECTURE_OPTION} -P buildlibressl.cmake
- )
+ build_library("libressl" ${GENERATOR_OPTION} -P buildlibressl.cmake)
endif(BUILD_SSL_LIBRARY)
message("done buildall.cmake")