layer for unicode をライブラリに分離

- Windows 9xをサポートするためのパートをライブラリとして切り出し - MSUL(unicows.lib)と同様に、ライブラリをリンクするだけで 9x をサポート - Tera Term のソース(layer for unicode 以外の部分)では 9x を気にする必要がなくなった - vs2005 のプロジェクトを調整 - CMakeLists.txt 調整 - VS2005 を使用しないと 95での起動はできない - しかしVS2005をサポートしている cmake のバージョンが古い git-svn-id: https://svn.osdn.net/svnroot/ttssh2/trunk@9325 f5f01b69-1e22-0410-acbf-894ab4bd6246
kevinlynn · Jun 29, 2021 · 5741bbb · 5741bbb
1 parent b7a4aef
commit 5741bbb
Show file tree

Hide file tree

Showing 42 changed files with 1,513 additions and 173 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -34,6 +34,14 @@ charset = cp932
 indent_style = tab
 indent_size = 4
 
+[*.asm]
+end_of_line = crlf
+charset = utf8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 [{CMakeLists.txt,*.cmake}]
 end_of_line = crlf
 charset = utf-8-bom

diff --git a/TTXKanjiMenu/CMakeLists.txt b/TTXKanjiMenu/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXAdditionalTitle/CMakeLists.txt b/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt b/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    common_static
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXCallSysMenu/CMakeLists.txt b/TTXSamples/TTXCallSysMenu/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXFixedWinSize/CMakeLists.txt b/TTXSamples/TTXFixedWinSize/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXResizeMenu/CMakeLists.txt b/TTXSamples/TTXResizeMenu/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXResizeWin/CMakeLists.txt b/TTXSamples/TTXResizeWin/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXShowCommandLine/CMakeLists.txt b/TTXSamples/TTXShowCommandLine/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/TTXSamples/TTXttyrec/CMakeLists.txt b/TTXSamples/TTXttyrec/CMakeLists.txt
@@ -10,6 +10,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    TTXttyplay
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       TTXttyplay
@@ -58,6 +63,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    TTXttyrec
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       TTXttyrec

diff --git a/TTXSamples/ttxtest/CMakeLists.txt b/TTXSamples/ttxtest/CMakeLists.txt
@@ -8,6 +8,11 @@ add_library(
   )
 
 if(SUPPORT_OLD_WINDOWS)
+  target_link_libraries(
+    ${PACKAGE_NAME}
+    PRIVATE
+    layer_for_unicode
+    )
   if(MSVC)
     target_sources(
       ${PACKAGE_NAME}

diff --git a/buildtools/nasm.cmake b/buildtools/nasm.cmake
@@ -0,0 +1,20 @@
+# cmake -P nasm.cmake
+
+set(NASM_BASE "nasm-2.15.05")
+set(NASM_ZIP "${NASM_BASE}-win32.zip")
+set(NASM_URL "https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/win32/${NASM_ZIP}")
+set(NASM_HASH "258c7d1076e435511cf2fdf94e2281eadbdb9e3003fd57f356f446e2bce3119e")
+file(MAKE_DIRECTORY "download/nasm")
+file(DOWNLOAD
+  ${NASM_URL}
+  download/nasm/${NASM_ZIP}
+  EXPECTED_HASH SHA256=${NASM_HASH}
+  SHOW_PROGRESS
+  )
+if(EXISTS "nasm")
+    file(REMOVE_RECURSE "nasm")
+endif()
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E tar xvf download/nasm/${NASM_ZIP}
+  )
+file(RENAME "${NASM_BASE}" "nasm")
diff --git a/teraterm/CMakeLists.txt b/teraterm/CMakeLists.txt
@@ -37,9 +37,20 @@ set_target_properties(
   common_static
   PROPERTIES FOLDER teraterm)
 
-if(SUPPORT_OLD_WINDOWS AND MINGW)
-  add_subdirectory(libmingw)
-  set_target_properties(
-    mingw_msvcrt
-    PROPERTIES FOLDER teraterm)
+if(SUPPORT_OLD_WINDOWS)
+  if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    add_subdirectory(common/layer_for_unicode)
+    set_target_properties(
+      layer_for_unicode
+      PROPERTIES FOLDER teraterm)
+  endif()
+
+  if(MINGW)
+    add_subdirectory(libmingw)
+    set_target_properties(
+      mingw_msvcrt
+      PROPERTIES FOLDER teraterm)
+  endif(MINGW)
 endif()
+
+
diff --git a/teraterm/common/CMakeLists.txt b/teraterm/common/CMakeLists.txt
@@ -25,8 +25,6 @@ add_library(
   getcontent.h
   i18n.h
   i18n_static.c
-  layer_for_unicode_crt.h
-  layer_for_unicode_crt.cpp
   tipwin.cpp
   tipwin.h
   tmfc.cpp
@@ -51,5 +49,6 @@ target_include_directories(
 target_link_libraries(
   ${PACKAGE_NAME}
   PUBLIC
+  #
   setupapi
   )
diff --git a/teraterm/common/common_static.v16.vcxproj b/teraterm/common/common_static.v16.vcxproj
@@ -172,4 +172,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/teraterm/common/fileread.cpp b/teraterm/common/fileread.cpp
@@ -37,7 +37,6 @@
 
 #include "codeconv.h"
 #include "ttlib.h"
-#include "layer_for_unicode_crt.h"
 
 #include "fileread.h"
 
@@ -100,7 +99,7 @@ static void *LoadRawFile(FILE *fp, size_t *_len)
 uint8_t *LoadFileBinary(const wchar_t *FileName, size_t *_len)
 {
 	FILE *fp;
-	__wfopen_s(&fp, FileName, L"rb");
+	_wfopen_s(&fp, FileName, L"rb");
 	if (fp == NULL) {
 		return NULL;
 	}
@@ -254,7 +253,7 @@ wchar_t *LoadFileWW(const wchar_t *FileName, size_t *_len)
 		*_len = 0;
 	}
 	FILE *fp;
-	__wfopen_s(&fp, FileName, L"rb");
+	_wfopen_s(&fp, FileName, L"rb");
 	if (fp == NULL) {
 		return NULL;
 	}