scmno****@osdn*****
scmno****@osdn*****
2018年 9月 13日 (木) 23:54:21 JST
Tera TermRevision: 7239
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7239
Author: zmatsuo
Date: 2018-09-13 23:54:21 +0900 (Thu, 13 Sep 2018)
Log Message:
-----------
mingw対応
TTProxyは後回し
Modified Paths:
--------------
branches/cmake/CMakeLists.txt
branches/cmake/TTProxy/CMakeLists.txt
branches/cmake/TTProxy/YCL/include/YCL/Array.h
branches/cmake/TTProxy/YCL/include/YCL/HASHCODE.h
branches/cmake/TTProxy/YCL/include/YCL/Hashtable.h
branches/cmake/TTXKanjiMenu/CMakeLists.txt
branches/cmake/libs/lib_oniguruma.cmake
-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/CMakeLists.txt 2018-09-13 14:54:21 UTC (rev 7239)
@@ -31,7 +31,9 @@
add_subdirectory(teraterm)
add_subdirectory(ttpmenu)
-add_subdirectory(TTProxy)
+if(NOT MINGW)
+ add_subdirectory(TTProxy)
+endif()
add_subdirectory(ttssh2)
add_subdirectory(TTXKanjiMenu)
if(${ENABLE_TTXSAMPLES})
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/TTProxy/CMakeLists.txt 2018-09-13 14:54:21 UTC (rev 7239)
@@ -68,6 +68,12 @@
.
)
+if(MINGW)
+ link_directories(
+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+ )
+endif()
+
add_library(
ttproxy SHARED
${SRC}
Modified: branches/cmake/TTProxy/YCL/include/YCL/Array.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Array.h 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/TTProxy/YCL/include/YCL/Array.h 2018-09-13 14:54:21 UTC (rev 7239)
@@ -63,9 +63,11 @@
distination[i] = array[i];
}
}
+#if 0
void copyTo(Array* distination)const {
copyTo(distination->array[i]);
}
+#endif
};
}
Modified: branches/cmake/TTProxy/YCL/include/YCL/HASHCODE.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/HASHCODE.h 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/TTProxy/YCL/include/YCL/HASHCODE.h 2018-09-13 14:54:21 UTC (rev 7239)
@@ -25,7 +25,7 @@
}
HASHCODE(const HASHCODE& code):value(code.value) {
}
- HASHCODE(void* value):value((int) value) {
+ HASHCODE(const void* value):value((int) value) {
}
HASHCODE(int value):value(value) {
}
Modified: branches/cmake/TTProxy/YCL/include/YCL/Hashtable.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Hashtable.h 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/TTProxy/YCL/include/YCL/Hashtable.h 2018-09-13 14:54:21 UTC (rev 7239)
@@ -122,7 +122,7 @@
// \x91S\x82ẴG\x83\x93\x83g\x83\x8A\x82\xAA\x90ݒ\xE8\x8Dς݂\xC5key\x82Ɠ\x99\x82\xB5\x82\xA2\x82\xE0\x82̂\xAA\x82Ȃ\xAF\x82\xEA\x82\xCE-1\x82\xF0\x95Ԃ\xB7\x81B
int find(const TYPE_KEY& key)const {
int found = -1;
- int h = HASHCODE(key);
+ int h = HASHCODE(&key);
for (int i = 0; i < backetSize; i++) {
int index = ((unsigned) h + i) % backetSize;
const TYPE_KEY& bkey = backet[index].key;
Modified: branches/cmake/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXKanjiMenu/CMakeLists.txt 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/TTXKanjiMenu/CMakeLists.txt 2018-09-13 14:54:21 UTC (rev 7239)
@@ -16,6 +16,12 @@
.
)
+if(MINGW)
+ link_directories(
+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+ )
+endif()
+
add_library(
ttxkanjimenu SHARED
${SRC}
Modified: branches/cmake/libs/lib_oniguruma.cmake
===================================================================
--- branches/cmake/libs/lib_oniguruma.cmake 2018-09-13 14:47:43 UTC (rev 7238)
+++ branches/cmake/libs/lib_oniguruma.cmake 2018-09-13 14:54:21 UTC (rev 7239)
@@ -6,8 +6,8 @@
set(ONIGURUMA_ROOT "${ONIGURUMA_ROOT}_x64")
endif()
-set(ONIGURUMA_DIR "${ONIGURUMA_ROOT}/lib/cmake/oniguruma")
-find_package(ONIGURUMA REQUIRED)
+#set(ONIGURUMA_DIR "${ONIGURUMA_ROOT}/lib/cmake/oniguruma")
+#find_package(ONIGURUMA REQUIRED)
set(ONIGURUMA_INCLUDE_DIRS ${ONIGURUMA_ROOT}/include)
set(ONIGURUMA_LIBRARY_DIRS ${ONIGURUMA_ROOT}/lib)