• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7239 (tree)
Time2018-09-13 23:54:21
Authorzmatsuo

Log Message

mingw対応
TTProxyは後回し

Change Summary

Incremental Difference

--- branches/cmake/CMakeLists.txt (revision 7238)
+++ branches/cmake/CMakeLists.txt (revision 7239)
@@ -31,7 +31,9 @@
3131
3232 add_subdirectory(teraterm)
3333 add_subdirectory(ttpmenu)
34-add_subdirectory(TTProxy)
34+if(NOT MINGW)
35+ add_subdirectory(TTProxy)
36+endif()
3537 add_subdirectory(ttssh2)
3638 add_subdirectory(TTXKanjiMenu)
3739 if(${ENABLE_TTXSAMPLES})
--- branches/cmake/TTXKanjiMenu/CMakeLists.txt (revision 7238)
+++ branches/cmake/TTXKanjiMenu/CMakeLists.txt (revision 7239)
@@ -16,6 +16,12 @@
1616 .
1717 )
1818
19+if(MINGW)
20+ link_directories(
21+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
22+ )
23+endif()
24+
1925 add_library(
2026 ttxkanjimenu SHARED
2127 ${SRC}
--- branches/cmake/TTProxy/YCL/include/YCL/Array.h (revision 7238)
+++ branches/cmake/TTProxy/YCL/include/YCL/Array.h (revision 7239)
@@ -63,9 +63,11 @@
6363 distination[i] = array[i];
6464 }
6565 }
66+#if 0
6667 void copyTo(Array* distination)const {
6768 copyTo(distination->array[i]);
6869 }
70+#endif
6971 };
7072
7173 }
--- branches/cmake/TTProxy/YCL/include/YCL/HASHCODE.h (revision 7238)
+++ branches/cmake/TTProxy/YCL/include/YCL/HASHCODE.h (revision 7239)
@@ -25,7 +25,7 @@
2525 }
2626 HASHCODE(const HASHCODE& code):value(code.value) {
2727 }
28- HASHCODE(void* value):value((int) value) {
28+ HASHCODE(const void* value):value((int) value) {
2929 }
3030 HASHCODE(int value):value(value) {
3131 }
--- branches/cmake/TTProxy/YCL/include/YCL/Hashtable.h (revision 7238)
+++ branches/cmake/TTProxy/YCL/include/YCL/Hashtable.h (revision 7239)
@@ -122,7 +122,7 @@
122122 // 全てのエントリが設定済みでkeyと等しいものがなければ-1を返す。
123123 int find(const TYPE_KEY& key)const {
124124 int found = -1;
125- int h = HASHCODE(key);
125+ int h = HASHCODE(&key);
126126 for (int i = 0; i < backetSize; i++) {
127127 int index = ((unsigned) h + i) % backetSize;
128128 const TYPE_KEY& bkey = backet[index].key;
--- branches/cmake/TTProxy/CMakeLists.txt (revision 7238)
+++ branches/cmake/TTProxy/CMakeLists.txt (revision 7239)
@@ -68,6 +68,12 @@
6868 .
6969 )
7070
71+if(MINGW)
72+ link_directories(
73+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
74+ )
75+endif()
76+
7177 add_library(
7278 ttproxy SHARED
7379 ${SRC}
Show on old repository browser