Tera TermRevision: 8574
https://osdn.net/projects/ttssh2/scm/svn/commits/8574
Author: zmatsuo
Date: 2020-03-06 00:17:36 +0900 (Fri, 06 Mar 2020)
Log Message:
-----------
cmake ビルドで作成した実行ファイルが Windows 95 で動作するようにした
- GetModuleHandleExW() を使用していた
- OpenSLL の libcrypto.lib 内
- OpenSSL のビルド時のオプションが誤っていた
- Windows95 向けのパッチに抜けがあった
Modified Paths:
--------------
trunk/libs/openssl11.cmake
trunk/libs/openssl_patch/vs2005.patch
-------------- next part --------------
Modified: trunk/libs/openssl11.cmake
===================================================================
--- trunk/libs/openssl11.cmake 2020-03-05 15:17:26 UTC (rev 8573)
+++ trunk/libs/openssl11.cmake 2020-03-05 15:17:36 UTC (rev 8574)
@@ -280,7 +280,7 @@
)
endif()
file(APPEND "${SRC_DIR}/build_cmake.bat"
- "perl Configure no-asm no-async no-shared no-capieng -no-dso -no-engine ${CONFIG_TARGET} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR_N} --openssldir=${INSTALL_DIR_N}\\SSL\n"
+ "perl Configure no-asm no-async no-shared no-capieng no-dso no-engine ${CONFIG_TARGET} -D_WIN32_WINNT=0x0501 --prefix=${INSTALL_DIR_N} --openssldir=${INSTALL_DIR_N}\\SSL\n"
"nmake -f makefile install\n"
)
set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
Modified: trunk/libs/openssl_patch/vs2005.patch
===================================================================
--- trunk/libs/openssl_patch/vs2005.patch 2020-03-05 15:17:26 UTC (rev 8573)
+++ trunk/libs/openssl_patch/vs2005.patch 2020-03-05 15:17:36 UTC (rev 8574)
@@ -18,6 +18,23 @@
coutflag => "/Fo",
defines => add("OPENSSL_SYS_WIN32", "WIN32_LEAN_AND_MEAN",
***************
+*** 1230,1236 ****
+ shared_ldflag => "/dll",
+ shared_target => "win-shared", # meaningless except it gives Configure a hint
+ thread_scheme => "winthreads",
+! dso_scheme => "win32",
+ apps_aux_src => add("win32_init.c"),
+ bn_ops => "EXPORT_VAR_AS_FN",
+ # additional parameter to build_scheme denotes install-path "flavour"
+--- 1230,1236 ----
+ shared_ldflag => "/dll",
+ shared_target => "win-shared", # meaningless except it gives Configure a hint
+ thread_scheme => "winthreads",
+! #dso_scheme => "win32",
+ apps_aux_src => add("win32_init.c"),
+ bn_ops => "EXPORT_VAR_AS_FN",
+ # additional parameter to build_scheme denotes install-path "flavour"
+***************
*** 1313,1319 ****
"VC-WIN32" => {
inherit_from => [ "VC-noCE-common", asm("x86_asm"),
@@ -34,3 +51,54 @@
AS => sub { vc_win32_info()->{AS} },
ASFLAGS => sub { vc_win32_info()->{ASFLAGS} },
asoutflag => sub { vc_win32_info()->{asoutflag} },
+***************
+*** 1389,1395 ****
+ bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
+ thread_scheme => "winthreads",
+ perlasm_scheme => "coff",
+! dso_scheme => "win32",
+ shared_target => "mingw-shared",
+ shared_cppflags => add("_WINDLL"),
+ shared_ldflag => "-static-libgcc",
+--- 1389,1395 ----
+ bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
+ thread_scheme => "winthreads",
+ perlasm_scheme => "coff",
+! #dso_scheme => "win32",
+ shared_target => "mingw-shared",
+ shared_cppflags => add("_WINDLL"),
+ shared_ldflag => "-static-libgcc",
+***************
+*** 1425,1431 ****
+ bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
+ thread_scheme => "winthreads",
+ perlasm_scheme => "mingw64",
+! dso_scheme => "win32",
+ shared_target => "mingw-shared",
+ shared_cppflags => add("_WINDLL"),
+ shared_ldflag => "-static-libgcc",
+--- 1425,1431 ----
+ bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
+ thread_scheme => "winthreads",
+ perlasm_scheme => "mingw64",
+! #dso_scheme => "win32",
+ shared_target => "mingw-shared",
+ shared_cppflags => add("_WINDLL"),
+ shared_ldflag => "-static-libgcc",
+***************
+*** 1452,1458 ****
+ lib_cppflags => "-DTERMIOS -DL_ENDIAN",
+ sys_id => "UWIN",
+ bn_ops => "BN_LLONG",
+! dso_scheme => "win32",
+ },
+
+ #### Cygwin
+--- 1452,1458 ----
+ lib_cppflags => "-DTERMIOS -DL_ENDIAN",
+ sys_id => "UWIN",
+ bn_ops => "BN_LLONG",
+! #dso_scheme => "win32",
+ },
+
+ #### Cygwin