scmno****@osdn*****
scmno****@osdn*****
2018年 9月 8日 (土) 03:51:44 JST
Tera TermRevision: 7235
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7235
Author: zmatsuo
Date: 2018-09-08 03:51:43 +0900 (Sat, 08 Sep 2018)
Log Message:
-----------
TTProxy ある程度コンパイルできるように修正
Modified Paths:
--------------
branches/cmake/TTProxy/CMakeLists.txt
branches/cmake/TTProxy/ProxyWSockHook.h
branches/cmake/TTProxy/TTProxy.h
branches/cmake/TTProxy/YCL/include/YCL/Array.h
branches/cmake/TTProxy/YCL/include/YCL/FileVersion.h
branches/cmake/TTProxy/YCL/include/YCL/Window.h
-------------- next part --------------
Modified: branches/cmake/TTProxy/CMakeLists.txt
===================================================================
--- branches/cmake/TTProxy/CMakeLists.txt 2018-09-07 18:51:32 UTC (rev 7234)
+++ branches/cmake/TTProxy/CMakeLists.txt 2018-09-07 18:51:43 UTC (rev 7235)
@@ -4,12 +4,48 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake)
-set(SRC
+set(COMMON_SRC
../teraterm/common/ttlib.c
../teraterm/common/ttlib.h
../teraterm/common/i18n.c
../teraterm/common/i18n.h
+ )
+source_group(
+ "common"
+ FILES
+ ${COMMON_SRC}
+ )
+set(YCL_SRC
+ YCL/include/YCL/Array.h
+ YCL/include/YCL/ComboBoxCtrl.h
+ YCL/include/YCL/common.h
+ YCL/include/YCL/Dialog.h
+ YCL/include/YCL/DynamicLinkLibrary.h
+ YCL/include/YCL/EditBoxCtrl.h
+ YCL/include/YCL/Enumeration.h
+ YCL/include/YCL/FileVersion.h
+ YCL/include/YCL/HASHCODE.h
+ YCL/include/YCL/Hashtable.h
+ YCL/include/YCL/IniFile.h
+ YCL/include/YCL/Integer.h
+ YCL/include/YCL/Object.h
+ YCL/include/YCL/Pointer.h
+ YCL/include/YCL/Resource.h
+ YCL/include/YCL/String.h
+ YCL/include/YCL/StringBuffer.h
+ YCL/include/YCL/StringUtil.h
+ YCL/include/YCL/ValueCtrl.h
+ YCL/include/YCL/Vector.h
+ YCL/include/YCL/Window.h
+ )
+source_group(
+ "YCL"
+ FILES
+ ${YCL_SRC}
+ )
+
+set(SRC
Hooker.h
Logger.h
ProxyWSockHook.h
@@ -35,6 +71,8 @@
add_library(
ttproxy SHARED
${SRC}
+ ${COMMON_SRC}
+ ${YCL_SRC}
)
target_link_libraries(
Modified: branches/cmake/TTProxy/ProxyWSockHook.h
===================================================================
--- branches/cmake/TTProxy/ProxyWSockHook.h 2018-09-07 18:51:32 UTC (rev 7234)
+++ branches/cmake/TTProxy/ProxyWSockHook.h 2018-09-07 18:51:43 UTC (rev 7235)
@@ -20,12 +20,12 @@
extern char UILanguageFile[MAX_PATH];
-void UTIL_get_lang_msg(PCHAR key, PCHAR buf, int buf_len, PCHAR def)
+void UTIL_get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def)
{
GetI18nStr("TTProxy", key, buf, buf_len, def, UILanguageFile);
}
-int UTIL_get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font)
+int UTIL_get_lang_font(const char *key, HWND dlg, PLOGFONT logfont, HFONT *font)
{
if (GetI18nLogfont("TTProxy", key, logfont,
GetDeviceCaps(GetDC(dlg),LOGPIXELSY),
@@ -44,7 +44,7 @@
public:
class MessageShower {
public:
- virtual void showMessage(const char* message)const = NULL;
+ virtual void showMessage(const char* message)const = 0;
};
private:
struct DUMMYHOSTENT {
Modified: branches/cmake/TTProxy/TTProxy.h
===================================================================
--- branches/cmake/TTProxy/TTProxy.h 2018-09-07 18:51:32 UTC (rev 7234)
+++ branches/cmake/TTProxy/TTProxy.h 2018-09-07 18:51:43 UTC (rev 7235)
@@ -48,7 +48,7 @@
static void add_error_message(const char* message) {
if (getInstance().error_message != NULL) {
- StringBuffer buffer = getInstance().error_message;
+ StringBuffer buffer = (const char *)getInstance().error_message;
buffer.append("\n\n");
buffer.append(message);
getInstance().error_message = buffer.toString();
Modified: branches/cmake/TTProxy/YCL/include/YCL/Array.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Array.h 2018-09-07 18:51:32 UTC (rev 7234)
+++ branches/cmake/TTProxy/YCL/include/YCL/Array.h 2018-09-07 18:51:43 UTC (rev 7235)
@@ -53,9 +53,11 @@
array[i] = source[i];
}
}
+#if 0
void copyFrom(Array* source) {
copy(source->array[i]);
}
+#endif
void copyTo(TYPE distination[])const {
for (int i = 0; i < length; i++) {
distination[i] = array[i];
Modified: branches/cmake/TTProxy/YCL/include/YCL/FileVersion.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/FileVersion.h 2018-09-07 18:51:32 UTC (rev 7234)
+++ branches/cmake/TTProxy/YCL/include/YCL/FileVersion.h 2018-09-07 18:51:43 UTC (rev 7235)
@@ -11,7 +11,9 @@
#include <YCL/common.h>
+#if defined(_MSC_VER)
#pragma comment(lib, "version.lib")
+#endif
namespace yebisuya {
Modified: branches/cmake/TTProxy/YCL/include/YCL/Window.h
===================================================================
--- branches/cmake/TTProxy/YCL/include/YCL/Window.h 2018-09-07 18:51:32 UTC (rev 7234)
+++ branches/cmake/TTProxy/YCL/include/YCL/Window.h 2018-09-07 18:51:43 UTC (rev 7235)
@@ -356,7 +356,9 @@
}
};
+#if defined(_MSC_VER)
#pragma comment(lib, "user32.lib")
+#endif
}
#endif//_YCL_WINDOWS_H_