scmno****@osdn*****
scmno****@osdn*****
2018年 9月 3日 (月) 19:52:08 JST
Tera TermRevision: 7226
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7226
Author: zmatsuo
Date: 2018-09-03 19:52:08 +0900 (Mon, 03 Sep 2018)
Log Message:
-----------
teraterm.exeがコンパイルできる程度に直す
うまく起動しない
Modified Paths:
--------------
branches/cmake/teraterm/CMakeLists.txt
branches/cmake/teraterm/common/servicenames.c
branches/cmake/teraterm/teraterm/prnabort.cpp
branches/cmake/teraterm/teraterm/prnabort.h
branches/cmake/teraterm/ttpset/CMakeLists.txt
branches/cmake/ttssh2/ttxssh/CMakeLists.txt
-------------- next part --------------
Modified: branches/cmake/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/CMakeLists.txt 2018-09-03 10:52:03 UTC (rev 7225)
+++ branches/cmake/teraterm/CMakeLists.txt 2018-09-03 10:52:08 UTC (rev 7226)
@@ -34,14 +34,14 @@
ttptek
PROPERTIES FOLDER teraterm)
-if((${CMAKE_MAKE_PROGRAM} MATCHES "VCExpress.exe") OR MINGW)
- message("pass teraterm compile")
-else()
+#if((${CMAKE_MAKE_PROGRAM} MATCHES "VCExpress.exe") OR MINGW)
+# message("pass teraterm compile")
+#else()
add_subdirectory(teraterm)
set_target_properties(
teraterm
PROPERTIES FOLDER teraterm)
-endif()
+#endif()
add_subdirectory(keycode)
set_target_properties(
Modified: branches/cmake/teraterm/common/servicenames.c
===================================================================
--- branches/cmake/teraterm/common/servicenames.c 2018-09-03 10:52:03 UTC (rev 7225)
+++ branches/cmake/teraterm/common/servicenames.c 2018-09-03 10:52:08 UTC (rev 7226)
@@ -379,7 +379,7 @@
return (isalnum(ch) || ch == '_' || ch == '-');
}
-int WINAPI parse_port_from_buf(char * buf)
+DllExport int WINAPI parse_port_from_buf(char * buf)
{
int i;
char lower_buf[32];
Modified: branches/cmake/teraterm/teraterm/prnabort.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/prnabort.cpp 2018-09-03 10:52:03 UTC (rev 7225)
+++ branches/cmake/teraterm/teraterm/prnabort.cpp 2018-09-03 10:52:08 UTC (rev 7226)
@@ -72,7 +72,9 @@
TTCDialog::OnCancel();
}
+#if 0
void CPrnAbortDlg::PostNcDestroy()
{
TTCDialog::DestroyWindow();
}
+#endif
Modified: branches/cmake/teraterm/teraterm/prnabort.h
===================================================================
--- branches/cmake/teraterm/teraterm/prnabort.h 2018-09-03 10:52:03 UTC (rev 7225)
+++ branches/cmake/teraterm/teraterm/prnabort.h 2018-09-03 10:52:08 UTC (rev 7226)
@@ -42,7 +42,7 @@
BOOL Create(HINSTANCE hInstance, HWND hParent, PBOOL AbortFlag, PTTSet pts);
void OnCancel();
void OnInitDialog();
- void PostNcDestroy();
+// void PostNcDestroy();
private:
BOOL *m_pAbort;
Modified: branches/cmake/teraterm/ttpset/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpset/CMakeLists.txt 2018-09-03 10:52:03 UTC (rev 7225)
+++ branches/cmake/teraterm/ttpset/CMakeLists.txt 2018-09-03 10:52:08 UTC (rev 7226)
@@ -17,6 +17,7 @@
../common/tttypes.h
../common/ttlib.c
../common/ttlib.h
+ ../common/servicenames.h
)
source_group(
Modified: branches/cmake/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2018-09-03 10:52:03 UTC (rev 7225)
+++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2018-09-03 10:52:08 UTC (rev 7226)
@@ -10,6 +10,7 @@
../../teraterm/common/ttcommon.h
../../teraterm/common/i18n.h
../../teraterm/common/ttlib.h
+ ../../teraterm/common/servicenames.h
)
source_group(