• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7232 (tree)
Time2018-09-08 03:51:10
Authorzmatsuo

Log Message

TTXSamles 出力ファイル名を調整
- TTXttyrec MinGWでコンパイルを通せなかった

Change Summary

Incremental Difference

--- branches/cmake/TTXSamples/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/CMakeLists.txt (revision 7232)
@@ -38,9 +38,11 @@
3838 add_subdirectory(TTXtest)
3939 set_target_properties(TTXtest PROPERTIES FOLDER TTXSamples)
4040
41-add_subdirectory(TTXttyrec)
42-set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples)
43-set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples)
41+if(MSVC)
42+ add_subdirectory(TTXttyrec)
43+ set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples)
44+ set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples)
45+endif(MSVC)
4446
4547 add_subdirectory(TTXViewMode)
4648 set_target_properties(TTXViewMode PROPERTIES FOLDER TTXSamples)
--- branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt (revision 7232)
@@ -13,14 +13,25 @@
1313 ../../teraterm/common
1414 )
1515
16+if(MINGW)
17+ link_directories(
18+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
19+ )
20+endif()
21+
1622 add_library(
1723 TTXAdditionalTitle SHARED
1824 ${SRC}
1925 )
2026
27+set_target_properties(
28+ TTXAdditionalTitle
29+ PROPERTIES
30+ PREFIX ""
31+ )
32+
2133 target_link_libraries(
2234 TTXAdditionalTitle
2335 ttpcmn
2436 )
2537
26-
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt (revision 7232)
@@ -13,11 +13,23 @@
1313 ../../teraterm/common
1414 )
1515
16+if(MINGW)
17+ link_directories(
18+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
19+ )
20+endif()
21+
1622 add_library(
1723 TTXAlwaysOnTop SHARED
1824 ${SRC}
1925 )
2026
27+set_target_properties(
28+ TTXAlwaysOnTop
29+ PROPERTIES
30+ PREFIX ""
31+ )
32+
2133 target_link_libraries(
2234 TTXAlwaysOnTop
2335 ttpcmn
--- branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt (revision 7232)
@@ -17,3 +17,9 @@
1717 TTXCallSysMenu SHARED
1818 ${SRC}
1919 )
20+
21+set_target_properties(
22+ TTXCallSysMenu
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt (revision 7232)
@@ -13,11 +13,23 @@
1313 ../../teraterm/common
1414 )
1515
16+if(MINGW)
17+ link_directories(
18+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
19+ )
20+endif()
21+
1622 add_library(
1723 TTXCommandLineOpt SHARED
1824 ${SRC}
1925 )
2026
27+set_target_properties(
28+ TTXCommandLineOpt
29+ PROPERTIES
30+ PREFIX ""
31+ )
32+
2133 target_link_libraries(
2234 TTXCommandLineOpt
2335 ttpcmn
--- branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt (revision 7232)
@@ -18,4 +18,8 @@
1818 ${SRC}
1919 )
2020
21-
21+set_target_properties(
22+ TTXCopyIniFile
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt (revision 7232)
@@ -18,4 +18,8 @@
1818 ${SRC}
1919 )
2020
21-
21+set_target_properties(
22+ TTXFixedWinSize
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt (revision 7232)
@@ -18,4 +18,8 @@
1818 ${SRC}
1919 )
2020
21-
21+set_target_properties(
22+ TTXKcodeChange
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt (revision 7232)
@@ -18,4 +18,8 @@
1818 ${SRC}
1919 )
2020
21-
21+set_target_properties(
22+ TTXOutputBuffering
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt (revision 7232)
@@ -14,11 +14,23 @@
1414 ../../teraterm/common
1515 )
1616
17+if(MINGW)
18+ link_directories(
19+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
20+ )
21+endif()
22+
1723 add_library(
1824 TTXRecurringCommand SHARED
1925 ${SRC}
2026 )
2127
28+set_target_properties(
29+ TTXRecurringCommand
30+ PROPERTIES
31+ PREFIX ""
32+ )
33+
2234 target_link_libraries(
2335 TTXRecurringCommand
2436 ttpcmn
--- branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt (revision 7232)
@@ -13,11 +13,23 @@
1313 ../../teraterm/common
1414 )
1515
16+if(MINGW)
17+ link_directories(
18+ ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
19+ )
20+endif()
21+
1622 add_library(
1723 TTXResizeMenu SHARED
1824 ${SRC}
1925 )
2026
27+set_target_properties(
28+ TTXResizeMenu
29+ PROPERTIES
30+ PREFIX ""
31+ )
32+
2133 target_link_libraries(
2234 TTXResizeMenu
2335 ttpcmn
--- branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt (revision 7232)
@@ -18,4 +18,8 @@
1818 ${SRC}
1919 )
2020
21-
21+set_target_properties(
22+ TTXResizeWin
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt (revision 7232)
@@ -18,4 +18,8 @@
1818 ${SRC}
1919 )
2020
21-
21+set_target_properties(
22+ TTXShowCommandLine
23+ PROPERTIES
24+ PREFIX ""
25+ )
--- branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt (revision 7232)
@@ -20,3 +20,9 @@
2020 TTXViewMode SHARED
2121 ${SRC}
2222 )
23+
24+set_target_properties(
25+ TTXViewMode
26+ PROPERTIES
27+ PREFIX ""
28+ )
--- branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt (revision 7232)
@@ -30,4 +30,8 @@
3030 ReadMe-ja.txt
3131 )
3232
33-
33+set_target_properties(
34+ TTXttyrec TTXttyplay
35+ PROPERTIES
36+ PREFIX ""
37+ )
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c (revision 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c (revision 7232)
@@ -10,7 +10,9 @@
1010 #include <winsock2.h>
1111 #include <ws2tcpip.h>
1212
13+#if defined(_MSC_VER)
1314 #include "gettimeofday.h"
15+#endif
1416
1517 #include "compat_w95.h"
1618
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c (revision 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c (revision 7232)
@@ -9,7 +9,9 @@
99 #include <winsock2.h>
1010 #include <ws2tcpip.h>
1111
12+#if defined(_MSC_VER)
1213 #include "gettimeofday.h"
14+#endif
1315
1416 #include "compat_w95.h"
1517
--- branches/cmake/TTXSamples/TTXttyrec/gettimeofday.c (revision 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/gettimeofday.c (revision 7232)
@@ -1,9 +1,17 @@
11 #include "gettimeofday.h"
22
3+// unix time epoch from windows file time
4+#if defined(_MSC_VER)
5+#define FTEPOCHDIFF 116444736000000000i64
6+#else
7+#define FTEPOCHDIFF 116444736000000000LL
8+#endif
9+
310 int gettimeofday(struct timeval *tv, struct timezone *tz) {
411 FILETIME ft;
512 __int64 t;
6- int tzsec, dst;
13+ long tzsec;
14+ int dst;
715
816 if (tv) {
917 GetSystemTimeAsFileTime(&ft);
--- branches/cmake/TTXSamples/TTXttyrec/gettimeofday.h (revision 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/gettimeofday.h (revision 7232)
@@ -3,13 +3,13 @@
33 #include <windows.h>
44 #include <time.h>
55
6+#if defined(_MSC_VER)
67 struct timezone {
78 int tz_minuteswest;
89 int tz_dsttime;
910 };
11+#endif
1012
11-#define FTEPOCHDIFF 116444736000000000i64
12-
1313 int gettimeofday(struct timeval *tv, struct timezone *tz);
1414 struct timeval tvdiff(struct timeval a, struct timeval b);
1515 struct timeval tvshift(struct timeval tv, int shift);
--- branches/cmake/TTXSamples/ttxtest/CMakeLists.txt (revision 7231)
+++ branches/cmake/TTXSamples/ttxtest/CMakeLists.txt (revision 7232)
@@ -11,3 +11,9 @@
1111 TTXtest SHARED
1212 TTXtest.c
1313 )
14+
15+set_target_properties(
16+ TTXtest
17+ PROPERTIES
18+ PREFIX ""
19+ )
Show on old repository browser