Tera Term

[Ttssh2-commit] [7232] TTXSamles 出力ファイル名を調整

scmno****@osdn***** scmno****@osdn*****
2018年 9月 8日 (土) 03:51:10 JST

• 前の記事 [Ttssh2-commit] [7231] 警告対策
• 次の記事 [Ttssh2-commit] [7233] MinGWでプラグインをロードできるようにした
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 7232
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7232
Author:   zmatsuo
Date:     2018-09-08 03:51:10 +0900 (Sat, 08 Sep 2018)
Log Message:
-----------
TTXSamles 出力ファイル名を調整
- TTXttyrec MinGWでコンパイルを通せなかった

Modified Paths:
--------------
    branches/cmake/TTXSamples/CMakeLists.txt
    branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
    branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
    branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt
    branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
    branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt
    branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt
    branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt
    branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt
    branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
    branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt
    branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt
    branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt
    branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt
    branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt
    branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c
    branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c
    branches/cmake/TTXSamples/TTXttyrec/gettimeofday.c
    branches/cmake/TTXSamples/TTXttyrec/gettimeofday.h
    branches/cmake/TTXSamples/ttxtest/CMakeLists.txt

-------------- next part --------------
Modified: branches/cmake/TTXSamples/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -38,9 +38,11 @@
 add_subdirectory(TTXtest)
 set_target_properties(TTXtest PROPERTIES FOLDER TTXSamples)
 
-add_subdirectory(TTXttyrec)
-set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples)
-set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples)
+if(MSVC)
+  add_subdirectory(TTXttyrec)
+  set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples)
+  set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples)
+endif(MSVC)
 
 add_subdirectory(TTXViewMode)
 set_target_properties(TTXViewMode PROPERTIES FOLDER TTXSamples)

Modified: branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -13,14 +13,25 @@
   ../../teraterm/common
   )
 
+if(MINGW)
+  link_directories(
+	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+	)
+endif()
+
 add_library(
   TTXAdditionalTitle SHARED
   ${SRC}
   )
 
+set_target_properties(
+  TTXAdditionalTitle
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXAdditionalTitle
   ttpcmn
   )
 
-

Modified: branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -13,11 +13,23 @@
   ../../teraterm/common
   )
 
+if(MINGW)
+  link_directories(
+	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+	)
+endif()
+
 add_library(
   TTXAlwaysOnTop SHARED
   ${SRC}
   )
 
+set_target_properties(
+  TTXAlwaysOnTop
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXAlwaysOnTop
   ttpcmn

Modified: branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -17,3 +17,9 @@
   TTXCallSysMenu SHARED
   ${SRC}
   )
+
+set_target_properties(
+  TTXCallSysMenu
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -13,11 +13,23 @@
   ../../teraterm/common
   )
 
+if(MINGW)
+  link_directories(
+	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+	)
+endif()
+
 add_library(
   TTXCommandLineOpt SHARED
   ${SRC}
   )
 
+set_target_properties(
+  TTXCommandLineOpt
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXCommandLineOpt
   ttpcmn

Modified: branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXCopyIniFile
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXFixedWinSize
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXKcodeChange
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXOutputBuffering
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -14,11 +14,23 @@
   ../../teraterm/common
   )
 
+if(MINGW)
+  link_directories(
+	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+	)
+endif()
+
 add_library(
   TTXRecurringCommand SHARED
   ${SRC}
   )
 
+set_target_properties(
+  TTXRecurringCommand
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXRecurringCommand
   ttpcmn

Modified: branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -13,11 +13,23 @@
   ../../teraterm/common
   )
 
+if(MINGW)
+  link_directories(
+	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
+	)
+endif()
+
 add_library(
   TTXResizeMenu SHARED
   ${SRC}
   )
 
+set_target_properties(
+  TTXResizeMenu
+  PROPERTIES
+  PREFIX ""
+  )
+
 target_link_libraries(
   TTXResizeMenu
   ttpcmn

Modified: branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXResizeWin
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -18,4 +18,8 @@
   ${SRC}
   )
 
-
+set_target_properties(
+  TTXShowCommandLine
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -20,3 +20,9 @@
   TTXViewMode SHARED
   ${SRC}
   )
+
+set_target_properties(
+  TTXViewMode
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -30,4 +30,8 @@
   ReadMe-ja.txt
   )
 
-
+set_target_properties(
+  TTXttyrec TTXttyplay
+  PROPERTIES
+  PREFIX ""
+  )

Modified: branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyplay.c	2018-09-07 18:51:10 UTC (rev 7232)
@@ -10,7 +10,9 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#if defined(_MSC_VER)
 #include "gettimeofday.h"
+#endif
 
 #include "compat_w95.h"
 

Modified: branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/TTXttyrec.c	2018-09-07 18:51:10 UTC (rev 7232)
@@ -9,7 +9,9 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#if defined(_MSC_VER)
 #include "gettimeofday.h"
+#endif
 
 #include "compat_w95.h"
 

Modified: branches/cmake/TTXSamples/TTXttyrec/gettimeofday.c
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/gettimeofday.c	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/gettimeofday.c	2018-09-07 18:51:10 UTC (rev 7232)
@@ -1,9 +1,17 @@
 #include "gettimeofday.h"
 
+// unix time epoch from windows file time 
+#if defined(_MSC_VER)
+#define FTEPOCHDIFF 116444736000000000i64
+#else
+#define FTEPOCHDIFF 116444736000000000LL
+#endif
+
 int gettimeofday(struct timeval *tv, struct timezone *tz) {
 	FILETIME ft;
 	__int64 t;
-	int tzsec, dst;
+	long tzsec;
+	int dst;
 
 	if (tv) {
 		GetSystemTimeAsFileTime(&ft);

Modified: branches/cmake/TTXSamples/TTXttyrec/gettimeofday.h
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/gettimeofday.h	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/TTXttyrec/gettimeofday.h	2018-09-07 18:51:10 UTC (rev 7232)
@@ -3,13 +3,13 @@
 #include <windows.h>
 #include <time.h>
 
+#if defined(_MSC_VER)
 struct timezone {
     int tz_minuteswest;
     int tz_dsttime;
 };
+#endif
 
-#define FTEPOCHDIFF 116444736000000000i64
-
 int gettimeofday(struct timeval *tv, struct timezone *tz);
 struct timeval tvdiff(struct timeval a, struct timeval b);
 struct timeval tvshift(struct timeval tv, int shift);

Modified: branches/cmake/TTXSamples/ttxtest/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/ttxtest/CMakeLists.txt	2018-09-07 18:50:57 UTC (rev 7231)
+++ branches/cmake/TTXSamples/ttxtest/CMakeLists.txt	2018-09-07 18:51:10 UTC (rev 7232)
@@ -11,3 +11,9 @@
   TTXtest SHARED
   TTXtest.c
   )
+
+set_target_properties(
+  TTXtest
+  PROPERTIES
+  PREFIX ""
+  )

• 前の記事 [Ttssh2-commit] [7231] 警告対策
• 次の記事 [Ttssh2-commit] [7233] MinGWでプラグインをロードできるようにした
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]