scmno****@osdn*****
scmno****@osdn*****
2018年 8月 22日 (水) 23:51:00 JST
Tera TermRevision: 7187
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7187
Author: zmatsuo
Date: 2018-08-22 23:51:00 +0900 (Wed, 22 Aug 2018)
Log Message:
-----------
OpenSSLを 1.0.2p にアップデート
- libs/openssl.cmake opensslコンパイルに失敗する場合があったので対策
- teraterm/vtwin.cpp 警告対策
Modified Paths:
--------------
branches/cmake/libs/openssl.cmake
branches/cmake/teraterm/teraterm/vtwin.cpp
branches/cmake/ttssh2/putty/CMakeLists.txt
-------------- next part --------------
Modified: branches/cmake/libs/openssl.cmake
===================================================================
--- branches/cmake/libs/openssl.cmake 2018-08-21 15:16:50 UTC (rev 7186)
+++ branches/cmake/libs/openssl.cmake 2018-08-22 14:51:00 UTC (rev 7187)
@@ -48,10 +48,10 @@
include(script_support.cmake)
-set(SRC_DIR_BASE "openssl-1.0.2o")
-set(SRC_ARC "openssl-1.0.2o.tar.xz")
-set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2o.tar.gz")
-set(SRC_ARC_HASH_SHA256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d)
+set(SRC_DIR_BASE "openssl-1.0.2p")
+set(SRC_ARC "openssl-1.0.2p.tar.gz")
+set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2p.tar.gz")
+set(SRC_ARC_HASH_SHA256 50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00)
set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
@@ -161,6 +161,13 @@
file(WRITE "${SRC_DIR}/build_cmake.bat"
"cd %~dp0\n"
)
+ file(TO_NATIVE_PATH ${PERL} PERL_N)
+ file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+ string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "del crypto\\buildinf.h\n"
+ "set PATH=${PERL_N_PATH}\n"
+ )
if(${CMAKE_GENERATOR} MATCHES "Visual Studio")
file(TO_NATIVE_PATH ${VCVARS32} VCVARS32_N)
file(APPEND "${SRC_DIR}/build_cmake.bat"
@@ -167,16 +174,9 @@
"call \"${VCVARS32_N}\"\n"
)
endif()
- file(TO_NATIVE_PATH ${PERL} PERL_N)
- file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
- string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
- file(APPEND "${SRC_DIR}/build_cmake.bat"
- "del crypto\\buildinf.h\n"
- "set PATH=${PERL_N_PATH};%PATH%\n"
- )
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
## Visual Studio 2005 特別処理
- # includeパスの設定
+ # include,libパスの設定
file(APPEND "${SRC_DIR}/build_cmake.bat"
"set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
"set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp 2018-08-21 15:16:50 UTC (rev 7186)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp 2018-08-22 14:51:00 UTC (rev 7187)
@@ -3887,7 +3887,7 @@
void CVTWindow::OnDuplicateSession()
{
char Command[1024];
- char *exec = "ttermpro";
+ const char *exec = "ttermpro";
STARTUPINFO si;
PROCESS_INFORMATION pi;
char cygterm_cfg[MAX_PATH];
Modified: branches/cmake/ttssh2/putty/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/putty/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
+++ branches/cmake/ttssh2/putty/CMakeLists.txt 2018-08-22 14:51:00 UTC (rev 7187)
@@ -2,7 +2,7 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-if(${MINGW})
+if(MINGW)
add_definitions("-D_WINDOWS")
endif()