Tera TermRevision: 7692
https://osdn.net/projects/ttssh2/scm/svn/commits/7692
Author: zmatsuo
Date: 2019-05-20 00:04:19 +0900 (Mon, 20 May 2019)
Log Message:
-----------
Merge r7530 into cmake
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/7530
Modified Paths:
--------------
branches/cmake/CMakeLists.txt
branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt
branches/cmake/installer/teraterm.iss
branches/cmake/teraterm/common/dlglib.c
branches/cmake/teraterm/common/dlglib_cpp.cpp
branches/cmake/teraterm/common/tipwin.cpp
branches/cmake/teraterm/common/ttlib.c
branches/cmake/teraterm/common/ttlib.h
branches/cmake/teraterm/teraterm/CMakeLists.txt
branches/cmake/teraterm/teraterm/addsetting.h
branches/cmake/teraterm/teraterm/filesys.cpp
branches/cmake/teraterm/teraterm/ftdlg.cpp
branches/cmake/teraterm/teraterm/ftdlg.h
branches/cmake/teraterm/teraterm/protodlg.cpp
branches/cmake/teraterm/teraterm/tekwin.cpp
branches/cmake/teraterm/teraterm/tekwin.h
branches/cmake/teraterm/teraterm/teraprn.cpp
branches/cmake/teraterm/teraterm/teraterm.cpp
branches/cmake/teraterm/teraterm/teraterml.h
branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj
branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters
branches/cmake/teraterm/teraterm/ttermpro.vcproj
branches/cmake/teraterm/teraterm/vtwin.cpp
branches/cmake/teraterm/teraterm/vtwin.h
branches/cmake/teraterm/ttermpro.sln
branches/cmake/teraterm/ttermpro.v10.sln
branches/cmake/teraterm/ttermpro.v11.sln
branches/cmake/teraterm/ttermpro.v12.sln
branches/cmake/teraterm/ttermpro.v14.sln
branches/cmake/teraterm/ttermpro.v15.sln
branches/cmake/teraterm/ttermpro.v9.sln
branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj
branches/cmake/teraterm/ttpdlg/ttdlg.c
branches/cmake/teraterm/ttpdlg/ttpdlg.rc
branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj
branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
branches/cmake/ttpmenu/ttpmenu.v10.vcxproj
branches/cmake/ttpmenu/ttpmenu.v11.vcxproj
branches/cmake/ttpmenu/ttpmenu.v12.vcxproj
branches/cmake/ttpmenu/ttpmenu.v14.vcxproj
branches/cmake/ttpmenu/ttpmenu.v15.vcxproj
branches/cmake/ttpmenu/ttpmenu.v9.vcproj
branches/cmake/ttpmenu/ttpmenu.vcproj
branches/cmake/ttssh2/putty/CMakeLists.txt
branches/cmake/ttssh2/ttxssh/CMakeLists.txt
branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj
branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
Added Paths:
-----------
branches/cmake/teraterm/ttpcmn/ttpcmn.def
Removed Paths:
-------------
branches/cmake/teraterm/teraterm/teraapp.h
branches/cmake/teraterm/ttpdlg/CMakeLists.txt
branches/cmake/teraterm/ttpdlg/svnversion.h.in
branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc
branches/cmake/teraterm/ttpdlg/ttpdlg.dsp
branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj
branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters
branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj
branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters
branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj
branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters
branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj
branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters
branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj
branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters
branches/cmake/teraterm/ttpdlg/ttpdlg.v9.vcproj
branches/cmake/teraterm/ttpdlg/ttpdlg.vcproj
-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -88,3 +88,12 @@
if(${ENABLE_TTXSAMPLES})
add_subdirectory(TTXSamples)
endif()
+
+####
+# ソースツリー内に生成ファイルが存在していたら削除する
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
+ file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/teraterm/ttpdlg/svnversion.h")
+endif()
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
+ file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/ttssh2/ttxssh/puttyversion.h")
+endif()
Modified: branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -11,6 +11,7 @@
../../teraterm/common/dlglib.c
../../teraterm/common/dlglib_cpp.cpp
../../teraterm/common/dlglib_tmpl.cpp
+ ../../teraterm/common/ttlib.c
)
source_group(
Modified: branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -2,6 +2,20 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
+set(COMMON_SRC
+ ../../teraterm/common/dlglib.h
+ ../../teraterm/common/dlglib.c
+ ../../teraterm/common/dlglib_cpp.cpp
+ ../../teraterm/common/dlglib_tmpl.cpp
+ ../../teraterm/common/ttlib.c
+ )
+
+source_group(
+ "common"
+ FILES
+ ${COMMON_SRC}
+ )
+
set(SRC
resource.h
TTXViewMode.c
@@ -19,6 +33,7 @@
add_library(
TTXViewMode SHARED
${SRC}
+ ${COMMON_SRC}
)
set_target_properties(
@@ -26,3 +41,10 @@
PROPERTIES
PREFIX ""
)
+
+target_link_libraries(
+ TTXViewMode
+ ttpcmn
+ #
+ gdi32
+ )
Modified: branches/cmake/installer/teraterm.iss
===================================================================
--- branches/cmake/installer/teraterm.iss 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/installer/teraterm.iss 2019-05-19 15:04:19 UTC (rev 7692)
@@ -67,7 +67,6 @@
[Files]
Source: ..\teraterm\release\ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
Source: ..\teraterm\release\ttpcmn.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
-Source: ..\teraterm\release\ttpdlg.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
Source: ..\teraterm\release\ttpfile.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
Source: ..\teraterm\release\ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
Source: ..\teraterm\release\ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
@@ -963,6 +962,7 @@
Name: {app}\copyfont.pif; Type: files
Name: {app}\libeay.txt; Type: files
Name: {app}\cygterm+-x86_64\cyglaunch.exe; Type: files
+Name: {app}\ttpdlg.dll; Type: files
[UninstallDelete]
Name: {app}\cygterm.exe; Type: files
Modified: branches/cmake/teraterm/common/dlglib.c
===================================================================
--- branches/cmake/teraterm/common/dlglib.c 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/common/dlglib.c 2019-05-19 15:04:19 UTC (rev 7692)
@@ -469,97 +469,6 @@
return info.found;
}
-/**
- * \x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8E擾\x82\xB7\x82\xE9
- * \x83G\x83\x89\x81[\x82͔\xAD\x90\xB6\x82\xB5\x82Ȃ\xA2
- */
-void GetMessageboxFont(LOGFONT *logfont)
-{
- NONCLIENTMETRICS nci;
- const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
- BOOL r;
-
- memset(&nci, 0, sizeof(nci));
- nci.cbSize = st_size;
- r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
- assert(r == TRUE);
- *logfont = nci.lfStatusFont;
-}
-
-/**
- * \x8Eg\x97p\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8C\x88\x92肷\x82\xE9
- */
-void SetDialogFont(const char *SetupFName,
- const char *UILanguageFile, const char *Section)
-{
- // teraterm.ini\x82̎w\x92\xE8
- if (SetupFName != NULL) {
- LOGFONTA logfont;
- BOOL result;
- result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName);
- if (result == TRUE) {
- result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE);
- if (result == TRUE) {
- TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
- return;
- }
- }
- }
-
- // .lng\x82̎w\x92\xE8
- if (UILanguageFile != NULL) {
- static const char *dlg_font_keys[] = {
- "DLG_FONT",
- "DLG_TAHOMA_FONT",
- "DLG_SYSTEM_FONT",
- };
- BOOL result = FALSE;
- LOGFONTA logfont;
- size_t i;
- if (Section != NULL) {
- for (i = 0; i < _countof(dlg_font_keys); i++) {
- result = GetI18nLogfont(Section, dlg_font_keys[i], &logfont, 0, UILanguageFile);
- if (result == FALSE) {
- continue;
- }
- if (logfont.lfFaceName[0] == '\0') {
- break;
- }
- if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
- break;
- }
- }
- }
- if (result == FALSE) {
- for (i = 0; i < _countof(dlg_font_keys); i++) {
- result = GetI18nLogfont("Tera Term", dlg_font_keys[i], &logfont, 0, UILanguageFile);
- if (result == FALSE) {
- continue;
- }
- if (logfont.lfFaceName[0] == '\0') {
- break;
- }
- if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
- break;
- }
- }
- }
- if (result == TRUE) {
- TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
- return;
- }
- }
-
- // ini,lng\x82Ŏw\x92肳\x82ꂽ\x83t\x83H\x83\x93\x83g\x82\xAA\x8C\xA9\x82\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A
- // \x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82Ő\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x8E\x96\x91ԂƂȂ\xE9
- // messagebox()\x82̃t\x83H\x83\x93\x83g\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD
- {
- LOGFONT logfont;
- GetMessageboxFont(&logfont);
- TTSetDlgFont(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
- }
-}
-
#if 0
HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
const char *UILanguageFile, PCHAR key)
Modified: branches/cmake/teraterm/common/dlglib_cpp.cpp
===================================================================
--- branches/cmake/teraterm/common/dlglib_cpp.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/common/dlglib_cpp.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -30,6 +30,7 @@
#include <windows.h>
#include "dlglib.h"
+#include "ttlib.h"
// \x83_\x83C\x83A\x83\x8D\x83O\x83\x82\x81[\x83_\x83\x8B\x8F\xF3\x91Ԃ̎\x9E\x81AOnIdle()\x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9
//#define ENABLE_CALL_IDLE_MODAL 1
@@ -240,3 +241,77 @@
hInstance, lpTemplateName,
hWndParent, lpDialogFunc, (LPARAM)NULL);
}
+
+/**
+ * \x8Eg\x97p\x82\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8C\x88\x92肷\x82\xE9
+ */
+void SetDialogFont(const char *SetupFName,
+ const char *UILanguageFile, const char *Section)
+{
+ // teraterm.ini\x82̎w\x92\xE8
+ if (SetupFName != NULL) {
+ LOGFONTA logfont;
+ BOOL result;
+ result = GetI18nLogfont("Tera Term", "DlgFont", &logfont, 0, SetupFName);
+ if (result == TRUE) {
+ result = IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE);
+ if (result == TRUE) {
+ TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+ return;
+ }
+ }
+ }
+
+ // .lng\x82̎w\x92\xE8
+ if (UILanguageFile != NULL) {
+ static const char *dlg_font_keys[] = {
+ "DLG_FONT",
+ "DLG_TAHOMA_FONT",
+ "DLG_SYSTEM_FONT",
+ };
+ BOOL result = FALSE;
+ LOGFONTA logfont;
+ size_t i;
+ if (Section != NULL) {
+ for (i = 0; i < _countof(dlg_font_keys); i++) {
+ result = GetI18nLogfont(Section, dlg_font_keys[i], &logfont, 0, UILanguageFile);
+ if (result == FALSE) {
+ continue;
+ }
+ if (logfont.lfFaceName[0] == '\0') {
+ break;
+ }
+ if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+ break;
+ }
+ }
+ }
+ if (result == FALSE) {
+ for (i = 0; i < _countof(dlg_font_keys); i++) {
+ result = GetI18nLogfont("Tera Term", dlg_font_keys[i], &logfont, 0, UILanguageFile);
+ if (result == FALSE) {
+ continue;
+ }
+ if (logfont.lfFaceName[0] == '\0') {
+ break;
+ }
+ if (IsExistFontA(logfont.lfFaceName, logfont.lfCharSet, TRUE)) {
+ break;
+ }
+ }
+ }
+ if (result == TRUE) {
+ TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+ return;
+ }
+ }
+
+ // ini,lng\x82Ŏw\x92肳\x82ꂽ\x83t\x83H\x83\x93\x83g\x82\xAA\x8C\xA9\x82\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x81A
+ // \x95\xB6\x8E\x9A\x89\xBB\x82\xAF\x82Ő\xB3\x82\xB5\x82\xAD\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x8E\x96\x91ԂƂȂ\xE9
+ // messagebox()\x82̃t\x83H\x83\x93\x83g\x82\xF0\x82Ƃ肠\x82\xA6\x82\xB8\x91I\x91\xF0\x82\xB5\x82Ă\xA8\x82\xAD
+ {
+ LOGFONTA logfont;
+ GetMessageboxFont(&logfont);
+ TTSetDlgFontA(logfont.lfFaceName, logfont.lfHeight, logfont.lfCharSet);
+ }
+}
Modified: branches/cmake/teraterm/common/tipwin.cpp
===================================================================
--- branches/cmake/teraterm/common/tipwin.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/common/tipwin.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -58,9 +58,10 @@
#include <windows.h>
#include <stdio.h>
#include <tchar.h>
-#include <commctrl.h> // for CCSIZEOF_STRUCT()
#include <assert.h>
+#include "ttlib.h" // for GetMessageboxFont()
+
#include "TipWin.h"
#define FRAME_WIDTH 6
@@ -190,20 +191,6 @@
return DefWindowProc(hWnd, nMsg, wParam, lParam);
}
-// todo: dlglib.c\x82ɓ\xAF\x93\x99\x82ȃR\x81[\x83h\x82\xA0\x82\xE8
-void GetMessageboxFont(LOGFONT *logfont)
-{
- NONCLIENTMETRICS nci;
- const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICS, lfMessageFont);
- BOOL r;
-
- memset(&nci, 0, sizeof(nci));
- nci.cbSize = st_size;
- r = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
- assert(r == TRUE);
- *logfont = nci.lfStatusFont;
-}
-
static void register_class(HINSTANCE hInst)
{
if (!tip_class) {
@@ -244,7 +231,7 @@
{
TipWin *pTipWin;
HINSTANCE hInst = (HINSTANCE)GetWindowLongPtr(src, GWLP_HINSTANCE);
- LOGFONT logfont;
+ LOGFONTA logfont;
register_class(hInst);
pTipWin = (TipWin *)malloc(sizeof(TipWin));
@@ -256,7 +243,7 @@
pTipWin->tip_bg = GetSysColor(COLOR_INFOBK);
pTipWin->tip_text = GetSysColor(COLOR_INFOTEXT);
GetMessageboxFont(&logfont);
- pTipWin->tip_font = CreateFontIndirect(&logfont);
+ pTipWin->tip_font = CreateFontIndirectA(&logfont);
CalcStrRect(pTipWin);
pTipWin->hParentWnd = src;
create_tipwin(pTipWin, hInst, cx, cy);
Modified: branches/cmake/teraterm/common/ttlib.c
===================================================================
--- branches/cmake/teraterm/common/ttlib.c 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/common/ttlib.c 2019-05-19 15:04:19 UTC (rev 7692)
@@ -28,7 +28,7 @@
*/
/* misc. routines */
-#include "teraterm.h"
+
#include <sys/stat.h>
#include <sys/utime.h>
#include <string.h>
@@ -37,9 +37,10 @@
#include <shlobj.h>
#include <ctype.h>
#include <mbctype.h> // for _ismbblead
+#include <assert.h>
+#include "teraterm.h"
#include "tttypes.h"
-#include "ttlib.h"
/* OS version with GetVersionEx(*1)
@@ -1915,3 +1916,20 @@
{
SetI18MenuStrs("Tera Term", hMenu, infos, infoCount, UILanguageFile);
}
+
+/**
+ * \x83_\x83C\x83A\x83\x8D\x83O\x83t\x83H\x83\x93\x83g\x82\xF0\x8E擾\x82\xB7\x82\xE9
+ * \x83G\x83\x89\x81[\x82͔\xAD\x90\xB6\x82\xB5\x82Ȃ\xA2
+ */
+void GetMessageboxFont(LOGFONTA *logfont)
+{
+ NONCLIENTMETRICSA nci;
+ const int st_size = CCSIZEOF_STRUCT(NONCLIENTMETRICSA, lfMessageFont);
+ BOOL r;
+
+ memset(&nci, 0, sizeof(nci));
+ nci.cbSize = st_size;
+ r = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, st_size, &nci, 0);
+ assert(r == TRUE);
+ *logfont = nci.lfStatusFont;
+}
Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/common/ttlib.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -128,6 +128,7 @@
BOOL GetPositionOnWindow(
HWND hWnd, const POINT *point,
BOOL *InWindow, BOOL *InClient, BOOL *InTitleBar);
+DllExport void GetMessageboxFont(LOGFONTA *logfont);
#define CheckFlag(var, flag) (((var) & (flag)) != 0)
Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -48,6 +48,9 @@
../common/tmfc.h
../common/tmfc_frame.cpp
../common/i18n.c
+ ../common/tmfc.cpp
+ ../common/tmfc.h
+ ../common/tmfc_frame.cpp
../common/i18n.h
../common/win16api.h
../common/win16api.c
@@ -72,6 +75,7 @@
set(TTDLG_SRC
../ttpdlg/dlg_res.h
../ttpdlg/ttdlg.c
+ ../ttpdlg/ttdlg.h
../ttpdlg/ttpdlg.rc
)
@@ -111,10 +115,10 @@
tekwin.h
telnet.c
telnet.h
- teraapp.h
teraprn.cpp
teraprn.h
teraterm.cpp
+ teraterml.h
ttdde.c
ttdde.h
ttdialog.c
@@ -150,6 +154,7 @@
#
teraterm.manifest
#
+ svnversion.h.in
${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
#
${COMMON_SRC}
@@ -212,6 +217,10 @@
ttptek
)
+configure_file(
+ svnversion.h.in
+ svnversion.h @ONLY)
+
# copy .lng files
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
add_custom_target(
@@ -267,3 +276,8 @@
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}$(Configuration)/lang/Traditional Chinese.lng"
)
endif()
+
+####
+configure_file(
+ svnversion.h.in
+ svnversion.h @ONLY)
Modified: branches/cmake/teraterm/teraterm/addsetting.h
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/addsetting.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,5 +1,5 @@
/*
- * (C) 2008-2018 TeraTerm Project
+ * (C) 2008-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cmake/teraterm/teraterm/filesys.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/filesys.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/filesys.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -28,8 +28,6 @@
*/
/* TERATERM.EXE, file transfer routines */
-//#undef UNICODE
-//#undef _UNICODE
#include <stdio.h>
#include <io.h>
#include <process.h>
Modified: branches/cmake/teraterm/teraterm/ftdlg.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/ftdlg.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ftdlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2018 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,23 +60,7 @@
cv->FilePause &= ~fv->OpId;
ts = pts;
-#if 0
- WNDCLASS wc;
- wc.style = CS_PARENTDC;
- wc.lpfnWndProc = TTCDialog::WndProcStub;
- wc.cbClsExtra = 0;
- wc.cbWndExtra = DLGWINDOWEXTRA;
- wc.hInstance = hInstance;
- wc.hIcon = NULL;
- wc.hCursor = LoadCursor(NULL,IDC_ARROW);
- wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
- wc.lpszMenuName = NULL;
- wc.lpszClassName = _T("FTDlg32");
- RegisterClass(&wc);
-#endif
-
Pause = FALSE;
-
hwnd = GetForegroundWindow();
if (fv->OpId == OpLog) { // parent window is desktop
Ok = TTCDialog::Create(hInstance, GetDesktopWindow(), CFileTransDlg::IDD);
Modified: branches/cmake/teraterm/teraterm/ftdlg.h
===================================================================
--- branches/cmake/teraterm/teraterm/ftdlg.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ftdlg.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2018 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cmake/teraterm/teraterm/protodlg.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/protodlg.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/protodlg.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2007-2018 TeraTerm Project
+ * (C) 2007-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cmake/teraterm/teraterm/tekwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/tekwin.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2018 TeraTerm Project
+ * (C) 2006-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,12 @@
#define TEKClassName _T("TEKWin32")
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
static HINSTANCE AfxGetInstanceHandle()
{
return hInst;
Modified: branches/cmake/teraterm/teraterm/tekwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/tekwin.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2017 TeraTerm Project
+ * (C) 2006-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Deleted: branches/cmake/teraterm/teraterm/teraapp.h
===================================================================
--- branches/cmake/teraterm/teraterm/teraapp.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/teraapp.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2009-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* TERATERM.EXE, Main application class */
-
-class CTeraApp : public CWinApp
-{
-public:
- CTeraApp();
-
- //{{AFX_VIRTUAL(CTeraApp)
- public:
- virtual BOOL InitInstance();
- virtual int ExitInstance();
- virtual BOOL OnIdle(LONG lCount);
- virtual BOOL PreTranslateMessage(MSG* pMsg);
- //}}AFX_VIRTUAL
-
- //{{AFX_MSG(CTeraApp)
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-};
Modified: branches/cmake/teraterm/teraterm/teraprn.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/teraprn.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/teraprn.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -40,6 +40,7 @@
#include "win16api.h"
#include "tt_res.h"
+#include "tmfc.h"
#include "prnabort.h"
#include "teraprn.h"
Modified: branches/cmake/teraterm/teraterm/teraterm.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/teraterm.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/teraterm.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2006-2018 TeraTerm Project
+ * (C) 2006-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,6 @@
#include "teraterml.h"
-
static BOOL AddFontFlag;
static TCHAR TSpecialFont[MAX_PATH];
@@ -277,7 +276,9 @@
CVTWindow *m_pMainWnd = new CVTWindow();
pVTWin = m_pMainWnd;
main_window = m_pMainWnd->m_hWnd;
- SetDialogFont(ts.SetupFName, ts.UILanguageFile, NULL);
+ // [Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCCDlgFont=\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82\xCD
+ // [TTSSH]\x83Z\x83N\x83V\x83\x87\x83\x93\x82̃t\x83H\x83\x93\x83g\x90ݒ\xE8\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9
+ SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
MSG msg;
while (GetMessage(&msg, NULL, 0, 0)) {
Modified: branches/cmake/teraterm/teraterm/teraterml.h
===================================================================
--- branches/cmake/teraterm/teraterm/teraterml.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/teraterml.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,5 +1,5 @@
/*
- * (C) 2018 TeraTerm Project
+ * (C) 2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.v10.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -194,10 +194,6 @@
<Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\ttpdlg\ttpdlg.v10.vcxproj">
- <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\ttpfile\ttpfile.v10.vcxproj">
<Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.v11.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -191,10 +191,6 @@
<Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\ttpdlg\ttpdlg.v11.vcxproj">
- <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\ttpfile\ttpfile.v11.vcxproj">
<Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.v12.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -193,10 +193,6 @@
<Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\ttpdlg\ttpdlg.v12.vcxproj">
- <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\ttpfile\ttpfile.v12.vcxproj">
<Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.v14.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -195,10 +195,6 @@
<Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\ttpdlg\ttpdlg.v14.vcxproj">
- <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\ttpfile\ttpfile.v14.vcxproj">
<Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -15,17 +15,18 @@
<RootNamespace>ttermpro</RootNamespace>
<Keyword>MFCProj</Keyword>
<ProjectName>ttermpro</ProjectName>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
- <UseOfMfc>Static</UseOfMfc>
+ <UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
- <UseOfMfc>Static</UseOfMfc>
+ <UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -64,7 +65,7 @@
<ClCompile>
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation />
@@ -77,21 +78,25 @@
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0411</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
</Link>
<Manifest>
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
+ <PreBuildEvent>
+ <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+ <Message>creating "$(ProjectDir)svnversion.h"</Message>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
@@ -106,7 +111,7 @@
<AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)common;$(SolutionDir)ttpfile;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -122,24 +127,33 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>LIBCMT.lib;onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>
+ </IgnoreSpecificDefaultLibraries>
</Link>
<Manifest>
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
+ <PreBuildEvent>
+ <Message>creating "$(ProjectDir)svnversion.h"</Message>
+ <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\common\compat_win.cpp" />
<ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="..\common\stdafx.cpp" />
+ <ClCompile Include="..\common\dlglib_cpp.cpp" />
+ <ClCompile Include="..\common\dlglib_tmpl.cpp" />
+ <ClCompile Include="..\common\tmfc.cpp" />
+ <ClCompile Include="..\common\tmfc_frame.cpp" />
<ClCompile Include="..\common\ttlib.c" />
+ <ClCompile Include="..\common\tipwin.cpp" />
<ClCompile Include="..\common\win16api.c" />
<ClCompile Include="..\common\codeconv.cpp" />
<ClCompile Include="..\common\dllutil.cpp" />
@@ -173,6 +187,9 @@
<ClCompile Include="vtwin.cpp" />
<ClCompile Include="winjump.c" />
<ClCompile Include="WSAAsyncGetAddrInfo.c" />
+ <ClInclude Include="../ttpdlg/dlg_res.h" />
+ <ClCompile Include="../ttpdlg/ttdlg.c" />
+ <ClInclude Include="../ttpdlg/ttdlg.h" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\cygterm\cygterm.ico" />
@@ -187,6 +204,7 @@
<ItemGroup>
<ResourceCompile Include="tt-version.rc" />
<ResourceCompile Include="ttermpro.rc" />
+ <ResourceCompile Include="../ttpdlg/ttpdlg.rc" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\compat_w95.h" />
@@ -194,6 +212,7 @@
<ClInclude Include="..\common\dlglib.h" />
<ClInclude Include="..\common\tektypes.h" />
<ClInclude Include="..\common\teraterm.h" />
+ <ClInclude Include="..\common\tmfc.h" />
<ClInclude Include="..\common\tt-version.h" />
<ClInclude Include="..\common\ttcommon.h" />
<ClInclude Include="..\common\ttddecmnd.h" />
@@ -232,14 +251,13 @@
<ClInclude Include="vtwin.h" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\svnrev\svnrev.v15.vcxproj">
+ <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+ </ProjectReference>
<ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">
<Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
- <ProjectReference Include="..\ttpdlg\ttpdlg.v15.vcxproj">
- <Project>{47cb840d-85c8-460f-9101-beb54bef9d56}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
<ProjectReference Include="..\ttpfile\ttpfile.v15.vcxproj">
<Project>{311f2b21-aec4-4384-8209-bb83b54749b4}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Modified: branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -19,14 +19,14 @@
<Filter Include="dialog">
<UniqueIdentifier>{23d7c62e-eff4-4a0d-b8b4-7fc703717c0e}</UniqueIdentifier>
</Filter>
+ <Filter Include="ttpdlg">
+ <UniqueIdentifier>{1cdaec4a-75c1-4600-b434-45286f5bec80}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="filesys.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\common\stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="tekwin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -123,6 +123,33 @@
<ClCompile Include="..\common\win16api.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\common\dlglib_cpp.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\dlglib_tmpl.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\tipwin.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\codeconv.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\dllutil.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\compat_win.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="../ttpdlg/ttdlg.c">
+ <Filter>ttpdlg</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\tmfc_frame.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\tmfc.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\cygterm\cygterm.ico">
@@ -157,6 +184,9 @@
<ResourceCompile Include="ttermpro.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
+ <ResourceCompile Include="../ttpdlg/ttpdlg.rc">
+ <Filter>ttpdlg</Filter>
+ </ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="sizetip.h">
@@ -282,5 +312,14 @@
<ClInclude Include="..\common\win16api.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="../ttpdlg/dlg_res.h">
+ <Filter>ttpdlg</Filter>
+ </ClInclude>
+ <ClInclude Include="../ttpdlg/ttdlg.h">
+ <Filter>ttpdlg</Filter>
+ </ClInclude>
+ <ClInclude Include="..\common\tmfc.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: branches/cmake/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/ttermpro.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -20,11 +20,13 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- UseOfMFC="1"
+ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
+ Description="creating "$(ProjectDir)svnversion.h""
+ CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
/>
<Tool
Name="VCCustomBuildTool"
@@ -48,7 +50,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+ AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="1"
BrowseInformation="0"
@@ -71,10 +73,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib imagehlp.lib"
+ AdditionalDependencies="onig_sd.lib comctl32.lib ws2_32.lib imagehlp.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(OutDir)"
+ AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
GenerateManifest="false"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
@@ -112,11 +114,13 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- UseOfMFC="1"
+ UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
<Tool
Name="VCPreBuildEventTool"
+ Description="creating "$(ProjectDir)svnversion.h""
+ CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
/>
<Tool
Name="VCCustomBuildTool"
@@ -141,7 +145,7 @@
AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+ AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="0"
@@ -164,10 +168,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib imagehlp.lib"
+ AdditionalDependencies="onig_s.lib comctl32.lib ws2_32.lib imagehlp.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(OutDir)"
+ AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
GenerateManifest="false"
DelayLoadDLLs="imagehlp.dll;user32.dll;shell32.dll"
GenerateDebugInformation="true"
@@ -213,14 +217,18 @@
>
</File>
<File
- RelativePath="..\common\compat_win.cpp"
+ RelativePath="..\common\dlglib.c"
>
</File>
<File
- RelativePath="..\common\dlglib.c"
+ RelativePath="..\common\dlglib_cpp.cpp"
>
</File>
<File
+ RelativePath="..\common\dlglib_tmpl.cpp"
+ >
+ </File>
+ <File
RelativePath="dnddlg.cpp"
>
</File>
@@ -241,10 +249,6 @@
>
</File>
<File
- RelativePath="..\common\stdafx.cpp"
- >
- </File>
- <File
RelativePath="tekwin.cpp"
>
</File>
@@ -257,6 +261,18 @@
>
</File>
<File
+ RelativePath="..\common\tmfc.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\common\tmfc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\common\tmfc_frame.cpp"
+ >
+ </File>
+ <File
RelativePath="vtwin.cpp"
>
</File>
@@ -318,10 +334,22 @@
>
</File>
<File
+ RelativePath="..\common\codeconv.cpp"
+ >
+ </File>
+ <File
RelativePath="commlib.c"
>
</File>
<File
+ RelativePath="..\common\compat_win.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\common\dllutil.cpp"
+ >
+ </File>
+ <File
RelativePath="keyboard.c"
>
</File>
@@ -338,6 +366,10 @@
>
</File>
<File
+ RelativePath="..\common\tipwin.cpp"
+ >
+ </File>
+ <File
RelativePath="ttdde.c"
>
</File>
@@ -382,6 +414,10 @@
>
</File>
<File
+ RelativePath="..\common\win16api.c"
+ >
+ </File>
+ <File
RelativePath="winjump.c"
>
</File>
@@ -389,55 +425,59 @@
RelativePath="WSAAsyncGetAddrInfo.c"
>
</File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath="..\common\win16api.c"
+ RelativePath="addsetting.h"
>
</File>
<File
- RelativePath="..\common\compat_win.cpp"
+ RelativePath="dnddlg.h"
>
</File>
<File
- RelativePath="..\common\dllutil.cpp"
+ RelativePath="sizetip.h"
>
</File>
<File
- RelativePath="..\common\codeconv.cpp"
+ RelativePath="..\common\tt_res.h"
>
</File>
<File
- RelativePath="..\common\tipwin.cpp"
+ RelativePath="ttfileio.h"
>
</File>
+ <File
+ RelativePath="..\common\win16api.h"
+ >
+ </File>
</Filter>
<Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl"
+ Name="ttdlg"
>
<File
- RelativePath="addsetting.h"
+ RelativePath="..\ttpdlg\dlg_res.h"
>
</File>
<File
- RelativePath="dnddlg.h"
+ RelativePath="..\ttpdlg\svnversion.h"
>
</File>
<File
- RelativePath="sizetip.h"
+ RelativePath="..\ttpdlg\ttdlg.c"
>
</File>
<File
- RelativePath="..\common\tt_res.h"
+ RelativePath="..\ttpdlg\ttdlg.h"
>
</File>
<File
- RelativePath="ttfileio.h"
+ RelativePath="..\ttpdlg\ttpdlg.rc"
>
</File>
- <File
- RelativePath="..\common\win16api.h"
- >
- </File>
</Filter>
</Files>
<Globals>
Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -816,7 +816,6 @@
#endif
wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
-// wc.lpfnWndProc = AfxWndProc;
wc.lpfnWndProc = (WNDPROC)ProcStub;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
@@ -1642,6 +1641,32 @@
/////////////////////////////////////////////////////////////////////////////
// CVTWindow message handler
+LRESULT CVTWindow::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
+{
+ LRESULT Result;
+
+ if (message == MsgDlgHelp) {
+ OnDlgHelp(wParam,lParam);
+ return 0;
+ }
+ else if ((ts.HideTitle>0) &&
+ (message == WM_NCHITTEST)) {
+ Result = CFrameWnd::DefWindowProc(message,wParam,lParam);
+ if ((Result==HTCLIENT) && AltKey())
+#ifdef ALPHABLEND_TYPE2
+ if(ShiftKey())
+ Result = HTBOTTOMRIGHT;
+ else
+ Result = HTCAPTION;
+#else
+ Result = HTCAPTION;
+#endif
+ return Result;
+ }
+
+ return (CFrameWnd::DefWindowProc(message,wParam,lParam));
+}
+
BOOL CVTWindow::OnCommand(WPARAM wParam, LPARAM lParam)
{
WORD wID = LOWORD(wParam);
@@ -2275,7 +2300,6 @@
if (MetaKey(ts.MetaKey) && (nFlags & 0x2000) != 0)
{
-
PeekMessage((LPMSG)&M,HVTWin,WM_CHAR,WM_CHAR,PM_REMOVE);
/* for Ctrl+Alt+Key combination */
GetKeyboardState((PBYTE)KeyState);
@@ -2446,7 +2470,7 @@
BOOL CVTWindow::OnMouseWheel(
UINT nFlags, // \x89\xBC\x91z\x83L\x81[
short zDelta, // \x89\xF1\x93]\x8B\x97\x97\xA3
- POINTS pts // \x83J\x81[\x83\\x83\x8B\x88ʒu
+ POINTS pts // \x83J\x81[\x83\\x83\x8B\x88ʒu
)
{
POINT pt;
@@ -4603,6 +4627,8 @@
_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s,%d,%d",
LogFont.lfFaceName, LogFont.lfHeight, LogFont.lfCharSet);
WritePrivateProfileStringA("Tera Term", "DlgFont", Temp, ts.SetupFName);
+
+ SetDialogFont(ts.SetupFName, ts.UILanguageFile, "TTSSH");
}
}
Modified: branches/cmake/teraterm/teraterm/vtwin.h
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.h 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/teraterm/vtwin.h 2019-05-19 15:04:19 UTC (rev 7692)
@@ -235,6 +235,7 @@
#undef afx_msg
void Disconnect(BOOL confirm);
///
+ LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
virtual LRESULT Proc(UINT msg, WPARAM wp, LPARAM lp);
};
#endif
Modified: branches/cmake/teraterm/ttermpro.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -2,12 +2,12 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
ProjectSection(ProjectDependencies) = postProject
- {47CB840D-85C8-460F-9101-BEB54BEF9D56} = {47CB840D-85C8-460F-9101-BEB54BEF9D56}
{BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A}
{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
{311F2B21-AEC4-4384-8209-BB83B54749B4} = {311F2B21-AEC4-4384-8209-BB83B54749B4}
+ {80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "keycode", "keycode\keycode.vcproj", "{B31BF2E8-79E6-4735-BEA2-C1B4041C2D2E}"
@@ -14,12 +14,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.vcproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.vcproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
- ProjectSection(ProjectDependencies) = postProject
- {80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
- {118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
ProjectSection(ProjectDependencies) = postProject
{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -60,10 +54,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Modified: branches/cmake/teraterm/ttermpro.v10.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v10.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.v10.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -6,8 +6,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v10.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v10.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v10.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v10.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -36,10 +34,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Modified: branches/cmake/teraterm/ttermpro.v11.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v11.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.v11.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -6,8 +6,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v11.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v11.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v11.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v11.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -36,10 +34,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Modified: branches/cmake/teraterm/ttermpro.v12.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v12.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.v12.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -8,8 +8,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v12.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v12.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v12.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v12.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Modified: branches/cmake/teraterm/ttermpro.v14.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v14.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.v14.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -8,8 +8,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v14.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v14.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v14.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v14.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Modified: branches/cmake/teraterm/ttermpro.v15.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v15.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.v15.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -8,8 +8,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v15.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v15.vcxproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v15.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v15.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
@@ -38,10 +36,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Modified: branches/cmake/teraterm/ttermpro.v9.sln
===================================================================
--- branches/cmake/teraterm/ttermpro.v9.sln 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttermpro.v9.sln 2019-05-19 15:04:19 UTC (rev 7692)
@@ -2,7 +2,6 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.v9.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
ProjectSection(ProjectDependencies) = postProject
- {47CB840D-85C8-460F-9101-BEB54BEF9D56} = {47CB840D-85C8-460F-9101-BEB54BEF9D56}
{BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A}
{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
@@ -14,12 +13,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v9.vcproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpdlg", "ttpdlg\ttpdlg.v9.vcproj", "{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
- ProjectSection(ProjectDependencies) = postProject
- {80F1C3F0-A213-4D48-85C8-A265990D19A7} = {80F1C3F0-A213-4D48-85C8-A265990D19A7}
- {118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v9.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
ProjectSection(ProjectDependencies) = postProject
{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -60,10 +53,6 @@
{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.ActiveCfg = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Debug|Win32.Build.0 = Debug|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.ActiveCfg = Release|Win32
- {47CB840D-85C8-460F-9101-BEB54BEF9D56}.Release|Win32.Build.0 = Release|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
Added: branches/cmake/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.def (rev 0)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.def 2019-05-19 15:04:19 UTC (rev 7692)
@@ -0,0 +1,97 @@
+EXPORTS
+ StartTeraTerm @1
+ ChangeDefaultSet @2
+ GetDefaultSet @3
+ GetKeyCode @4
+ GetKeyStr @5
+ SetCOMFlag @44
+ ClearCOMFlag @45
+ CheckCOMFlag @46
+ RegWin @10
+ UnregWin @11
+ SetWinMenu @12
+ SetWinList @13
+ SelectWin @14
+ SelectNextWin @15
+ GetNthWin @16
+ GetRegisteredWindowCount @89
+ ShowAllWin @54
+ CommReadRawByte @20
+ CommInsert1Byte @21
+ CommRead1Byte @22
+ CommRawOut @23
+ CommBinaryOut @24
+ CommBinaryBuffOut @52
+ CommTextOut @25
+ CommTextOutW
+ CommBinaryEcho @26
+ CommTextEcho @27
+ CommTextEchoW
+ DetectComPorts @42
+ GetDefaultFName @47
+ ExtractFileName @48
+ replaceInvalidFileNameChar @74
+ b64encode @75
+ b64decode @76
+ CreateNotifyIcon @77
+ DeleteNotifyIcon @78
+ ShowNotifyIcon @80
+ HideNotifyIcon @81
+ SetVerNotifyIcon @82
+ NotifyMessage @79
+ SetCustomNotifyIcon @85
+ GetCustomNotifyIcon @86
+
+ SJIS2JIS @30
+ SJIS2EUC @31
+ JIS2SJIS @32
+ RussConv @33
+ RussConvStr @34
+ ConvertUnicode @35
+ CopyTTSetToShmem @36
+ CopyShmemToTTSet @37
+
+ GetI18nStr @40
+ GetI18nLogfont @41
+
+ OutputDebugPrintf @49
+
+ doSelectFolder @51
+
+ mctimelocal @53
+ RestartTeraTerm @55
+ ShowAllWinSidebySide @56
+ ShowAllWinStacked @57
+ ShowAllWinCascade @58
+ BroadcastClosingMessage @59
+ UndoAllWin @60
+
+ OpenHelp @61
+
+ GetParam @62
+ DequoteParam @63
+
+ CheckComPort @64
+
+ IsWindows95 @65
+ IsWindowsMe @83
+ IsWindowsNT4 @66
+ IsWindows2000 @84
+ IsWindowsNTKernel @67
+ IsWindows2000OrLater @68
+ IsWindowsVistaOrLater @69
+ IsWindows7OrLater @70
+ HasMultiMonitorSupport @71
+ HasGetAdaptersAddresses @72
+ HasDnsQuery @73
+ HasBalloonTipSupport @87
+ GetDownloadFolder @88
+
+ parse_port @90
+ parse_port_from_buf @91
+ service_name @92
+ get_OPENFILENAME_SIZEA @93
+
+ SetI18DlgStrs
+ SetI18MenuStrs
+ GetMessageboxFont
Modified: branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpcmn/ttpcmn.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -213,6 +213,10 @@
>
</File>
<File
+ RelativePath="..\common\dlglib.c"
+ >
+ </File>
+ <File
RelativePath="..\common\i18n.c"
>
</File>
Deleted: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,79 +0,0 @@
-project(ttpdlg)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-
-if(MINGW)
- set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/../common")
-else()
- set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /i ${CMAKE_CURRENT_SOURCE_DIR}/../common")
-endif()
-
-set(COMMON_SRC
- ../common/dlglib.c
- ../common/dlglib.h
- ../common/dlglib_tmpl.cpp
- ../common/ttlib.c
- ../common/ttlib.h
- ../common/teraterm.ico
- )
-
-source_group(
- "common"
- FILES
- ${COMMON_SRC}
- )
-
-set(SRC
- dlg_res.h
- ttdlg.c
- ttpdlg.def
- ttpdlg.rc
- ttpdlg-version.rc
- ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
- ${COMMON_SRC}
- )
-
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/../common
- ${CMAKE_CURRENT_BINARY_DIR}
- ${ONIGURUMA_INCLUDE_DIRS}
- )
-
-link_directories(
- ${ONIGURUMA_LIBRARY_DIRS}
- )
-
-add_library(
- ttpdlg SHARED
- ${SRC}
- )
-
-if(MINGW)
- set_target_properties(
- ttpdlg
- PROPERTIES PREFIX ""
- SUFFIX ".dll"
- )
-endif()
-
-target_link_libraries(
- ttpdlg
- ttpcmn
- optimized onig.lib
- debug onigd.lib
- )
-
-add_dependencies(
- ttpdlg
- ttpcmn
- )
-
-configure_file(
- svnversion.h.in
- svnversion.h @ONLY)
-
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
- file(REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/svnversion.h")
-endif()
Deleted: branches/cmake/teraterm/ttpdlg/svnversion.h.in
===================================================================
--- branches/cmake/teraterm/ttpdlg/svnversion.h.in 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/svnversion.h.in 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1 +0,0 @@
-#cmakedefine SVNVERSION @SVNVERSION@
Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2004-2018 TeraTerm Project
+ * (C) 2004-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg-version.rc 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-#include "tt-version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
- PRODUCTVERSION TT_VERSION_MAJOR,TT_VERSION_MINOR,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "T. Teranishi, TeraTerm Project"
- VALUE "FileDescription", "Tera Term Dialog Routines"
- VALUE "FileVersion", TT_RES_VERSION_STR
- VALUE "InternalName", "TTPDLG"
- VALUE "LegalCopyright", "Copyright (C) 1994-1998 T. Teranishi, (C) 2004-2019 TeraTerm Project"
- VALUE "OriginalFilename", "TTPDLG.dll"
- VALUE "ProductName", "Tera Term"
- VALUE "ProductVersion", TT_RES_VERSION_STR
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.dsp
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.dsp 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.dsp 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,158 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ttpdlg" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ttpdlg - Win32 Release
-!MESSAGE NMAKE /f "ttpdlg.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "ttpdlg.mak" CFG="ttpdlg - Win32 Release"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "ttpdlg - Win32 Release" ("Win32 (x86) Dynamic-Link Library")
-!MESSAGE "ttpdlg - Win32 Debug" ("Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "ttpdlg - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\Release"
-# PROP BASE Intermediate_Dir ".\Release"
-# PROP BASE Target_Dir "."
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\bin\Release"
-# PROP Intermediate_Dir ".\Release"
-# PROP Target_Dir "."
-# ADD BASE CPP /nologo /MT /W3 /GX /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\source\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "NDEBUG"
-# ADD RSC /l 0x409 /i "..\..\source\common" /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF "$(CFG)" == "ttpdlg - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\Debug"
-# PROP BASE Intermediate_Dir ".\Debug"
-# PROP BASE Target_Dir "."
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\bin\Debug"
-# PROP Intermediate_Dir ".\Debug"
-# PROP Target_Dir "."
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\source\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x411 /d "_DEBUG"
-# ADD RSC /l 0x409 /i "..\..\source\common" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib comdlg32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-
-!ENDIF
-
-# Begin Target
-
-# Name "ttpdlg - Win32 Release"
-# Name "ttpdlg - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=..\..\source\common\dlglib.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\ttdlg\ttdlg.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\ttlib.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=..\..\source\common\dlglib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\source\common\ttlib.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\Source\Common\Teraterm.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Source\Ttdlg\ttpdlg.rc
-
-!IF "$(CFG)" == "ttpdlg - Win32 Release"
-
-# ADD BASE RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg"
-# SUBTRACT BASE RSC /i "..\..\source\common"
-# ADD RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg" /i "C:\DEV\TERATERM\source\ttdlg"
-# SUBTRACT RSC /i "..\..\source\common"
-
-!ELSEIF "$(CFG)" == "ttpdlg - Win32 Debug"
-
-# ADD BASE RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg"
-# SUBTRACT BASE RSC /i "..\..\source\common"
-# ADD RSC /l 0x411 /i "\DEV\TERATERM\Source\Ttdlg" /i "C:\DEV\TERATERM\source\ttdlg"
-# SUBTRACT RSC /i "..\..\source\common"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Lib Files"
-
-# PROP Default_Filter "lib"
-# Begin Source File
-
-SOURCE=..\bin\Release\ttpcmn.lib
-# End Source File
-# End Group
-# Begin Group "Def File"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\ttpdlg.def
-# End Source File
-# End Group
-# End Target
-# End Project
Modified: branches/cmake/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2019-05-19 15:04:19 UTC (rev 7692)
@@ -110,10 +110,10 @@
CONTROL "A&uto switch (VT<->TEK)",IDC_TERMAUTOSWITCH,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,123,80,110,12
GROUPBOX "&Kanji (receive)",IDC_TERMKANJILABEL,7,96,71,40
COMBOBOX IDC_TERMKANJI,11,107,39,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Hal&f-width kana",IDC_TERMKANA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,67,12
+ CONTROL "Hal&f-width kana",IDC_TERMKANA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,120,65,12
GROUPBOX "Kan&ji (transmit)",IDC_TERMKANJISENDLABEL,82,96,158,40
COMBOBOX IDC_TERMKANJISEND,86,107,40,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- CONTROL "Half-wi&dth kana",IDC_TERMKANASEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,120,68,12
+ CONTROL "Half-wi&dth kana",IDC_TERMKANASEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,120,68,12
CONTROL "Kanji-i&n:",IDC_TERMKINTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,150,109,48,11
COMBOBOX IDC_TERMKIN,203,107,32,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
CONTROL "Kanji-&out:",IDC_TERMKOUTTEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,150,122,48,11
@@ -297,9 +297,9 @@
COMBOBOX IDC_KEYBKEYB,57,47,44,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
CONTROL "&Meta key:",IDC_KEYBMETATEXT,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,12,63,44,9
COMBOBOX IDC_KEYBMETA,57,61,44,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Disabled mode:",IDC_KEYBDISABLE,10,74,130,35
- CONTROL "&Application Keypad",IDC_KEYBAPPKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,83,115,12
- CONTROL "Application &Cursor",IDC_KEYBAPPCUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,96,115,12
+ GROUPBOX "Disabled mode:",IDC_KEYBDISABLE,10,76,130,35
+ CONTROL "&Application Keypad",IDC_KEYBAPPKEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,85,115,12
+ CONTROL "Application &Cursor",IDC_KEYBAPPCUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,98,115,12
DEFPUSHBUTTON "OK",IDOK,107,7,40,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,107,26,40,14
PUSHBUTTON "&Help",IDC_KEYBHELP,107,55,40,14
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
- <RootNamespace>ttpdlg</RootNamespace>
- <ProjectName>ttpdlg</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName>
- </HeaderFileName>
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="ttdlg.c" />
- <ClCompile Include="..\common\ttlib.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h" />
- <ClInclude Include="..\common\dlglib.h" />
- <ClInclude Include="svnversion.h" />
- <ClInclude Include="..\common\ttlib.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\common\teraterm.ico" />
- <None Include="ttpdlg.def" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc" />
- <ResourceCompile Include="ttpdlg.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\svnrev\svnrev.v10.vcxproj">
- <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">
- <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v10.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{a9d1d40f-5c05-4158-82bb-0972cdbe171d}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{228fa5d0-626b-4dca-8b13-65d5b0967f80}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{cdb5aa6f-4c6b-4835-bdb1-bbdbff43c147}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Def File">
- <UniqueIdentifier>{c62d2476-c393-4f76-87ef-23b6db378623}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ttdlg.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\dlglib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="svnversion.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\ttlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="..\common\teraterm.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="ttpdlg.def">
- <Filter>Def File</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="ttpdlg.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
- <RootNamespace>ttpdlg</RootNamespace>
- <ProjectName>ttpdlg</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="ttdlg.c" />
- <ClCompile Include="..\common\ttlib.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h" />
- <ClInclude Include="..\common\dlglib.h" />
- <ClInclude Include="svnversion.h" />
- <ClInclude Include="..\common\ttlib.h" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc" />
- <ResourceCompile Include="ttpdlg.rc">
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\svnrev\svnrev.v11.vcxproj">
- <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">
- <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v11.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{b3e15d89-5e14-47cd-8c9d-1ef9ff14665e}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{db058bf4-3500-4713-9e3f-ae4709a5302a}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{bfa7a861-6702-43a8-a781-299131a60b57}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Def File">
- <UniqueIdentifier>{9d7a7614-70d2-495c-ab4a-33b9dbeeab51}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ttdlg.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\dlglib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="svnversion.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\ttlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="ttpdlg.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def">
- <Filter>Def File</Filter>
- </None>
- </ItemGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
- <RootNamespace>ttpdlg</RootNamespace>
- <ProjectName>ttpdlg</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v120</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v120</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="..\common\ttlib.c" />
- <ClCompile Include="ttdlg.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\common\dlglib.h" />
- <ClInclude Include="..\common\ttlib.h" />
- <ClInclude Include="dlg_res.h" />
- <ClInclude Include="svnversion.h" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc" />
- <ResourceCompile Include="ttpdlg.rc">
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\svnrev\svnrev.v12.vcxproj">
- <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
- <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v12.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Def File">
- <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ttdlg.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\dlglib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="svnversion.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\ttlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="ttpdlg.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def">
- <Filter>Def File</Filter>
- </None>
- </ItemGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
- <RootNamespace>ttpdlg</RootNamespace>
- <ProjectName>ttpdlg</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v140</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v140</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="..\common\ttlib.c" />
- <ClCompile Include="ttdlg.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\common\dlglib.h" />
- <ClInclude Include="..\common\ttlib.h" />
- <ClInclude Include="dlg_res.h" />
- <ClInclude Include="svnversion.h" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc" />
- <ResourceCompile Include="ttpdlg.rc">
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\svnrev\svnrev.v14.vcxproj">
- <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">
- <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v14.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Def File">
- <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="ttdlg.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\dlglib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="svnversion.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\ttlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="ttpdlg.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def">
- <Filter>Def File</Filter>
- </None>
- </ItemGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{47CB840D-85C8-460F-9101-BEB54BEF9D56}</ProjectGuid>
- <RootNamespace>ttpdlg</RootNamespace>
- <ProjectName>ttpdlg</ProjectName>
- <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v141</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v141</PlatformToolset>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
- <IntDir>$(Configuration)\</IntDir>
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <CompileAs>Default</CompileAs>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_s.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
- </PreBuildEvent>
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
- <HeaderFileName />
- </Midl>
- <ClCompile>
- <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <CompileAs>Default</CompileAs>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x0409</Culture>
- <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>onig_sd.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <ModuleDefinitionFile>$(ProjectName).def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)$(ProjectName).lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="..\common\ttlib.c" />
- <ClCompile Include="ttdlg.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\common\dlglib.h" />
- <ClInclude Include="..\common\ttlib.h" />
- <ClInclude Include="dlg_res.h" />
- <ClInclude Include="svnversion.h" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc" />
- <ResourceCompile Include="ttpdlg.rc">
- <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0411</Culture>
- <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0411</Culture>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\svnrev\svnrev.v15.vcxproj">
- <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
- </ProjectReference>
- <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj">
- <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v15.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{15850657-55f9-472f-ad74-1d01fd452e41}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{98e74669-55df-4889-8952-a63e1847bbed}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{7c254054-88fc-4c73-bb1e-b929eeeb4771}</UniqueIdentifier>
- <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions>
- </Filter>
- <Filter Include="Def File">
- <UniqueIdentifier>{9170a72d-c12a-4df1-8c20-12e277e36076}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="ttdlg.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="dlg_res.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\dlglib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="svnversion.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\common\ttlib.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Image Include="..\common\teraterm.ico">
- <Filter>Resource Files</Filter>
- </Image>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="ttpdlg-version.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- <ResourceCompile Include="ttpdlg.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <None Include="ttpdlg.def">
- <Filter>Def File</Filter>
- </None>
- </ItemGroup>
-</Project>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.v9.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.v9.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="ttpdlg"
- ProjectGUID="{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
- RootNamespace="ttpdlg"
- TargetFrameworkVersion="131072"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="$(SolutionDir)common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="onig_s.lib ttpcmn.lib"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
- ModuleDefinitionFile="$(ProjectName).def"
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)\$(ProjectName).lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
- Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- RuntimeLibrary="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="$(SolutionDir)common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="onig_sd.lib ttpcmn.lib"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
- ModuleDefinitionFile="$(ProjectName).def"
- GenerateDebugInformation="true"
- SubSystem="2"
- RandomizedBaseAddress="1"
- DataExecutionPrevention="0"
- ImportLibrary="$(OutDir)\$(ProjectName).lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
- >
- <File
- RelativePath="..\common\dlglib.c"
- >
- </File>
- <File
- RelativePath="ttdlg.c"
- >
- </File>
- <File
- RelativePath="..\common\ttlib.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- <File
- RelativePath="dlg_res.h"
- >
- </File>
- <File
- RelativePath="..\common\dlglib.h"
- >
- </File>
- <File
- RelativePath="svnversion.h"
- >
- </File>
- <File
- RelativePath="..\common\ttlib.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
- >
- <File
- RelativePath="..\common\teraterm.ico"
- >
- </File>
- <File
- RelativePath="ttpdlg-version.rc"
- >
- </File>
- <File
- RelativePath="ttpdlg.rc"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1041"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1041"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Def File"
- >
- <File
- RelativePath="ttpdlg.def"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Deleted: branches/cmake/teraterm/ttpdlg/ttpdlg.vcproj
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="ttpdlg"
- ProjectGUID="{47CB840D-85C8-460F-9101-BEB54BEF9D56}"
- RootNamespace="ttpdlg"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- WarningLevel="3"
- SuppressStartupBanner="true"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="$(SolutionDir)common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="onig_s.lib ttpcmn.lib"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
- ModuleDefinitionFile="$(ProjectName).def"
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(OutDir)\$(ProjectName).lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="true"
- SuppressStartupBanner="true"
- TargetEnvironment="1"
- TypeLibraryName="$(OutDir)\$(ProjectName).tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
- Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
- RuntimeLibrary="1"
- WarningLevel="3"
- SuppressStartupBanner="true"
- DebugInformationFormat="3"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="$(SolutionDir)common"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="onig_sd.lib ttpcmn.lib"
- LinkIncremental="1"
- SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(SolutionDir)..\libs\oniguruma\src;$(OutDir)"
- ModuleDefinitionFile="$(ProjectName).def"
- GenerateDebugInformation="true"
- SubSystem="2"
- ImportLibrary="$(OutDir)\$(ProjectName).lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
- >
- <File
- RelativePath="..\common\dlglib.c"
- >
- </File>
- <File
- RelativePath="ttdlg.c"
- >
- </File>
- <File
- RelativePath="..\common\ttlib.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- <File
- RelativePath="dlg_res.h"
- >
- </File>
- <File
- RelativePath="..\common\dlglib.h"
- >
- </File>
- <File
- RelativePath="svnversion.h"
- >
- </File>
- <File
- RelativePath="..\common\ttlib.h"
- >
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
- >
- <File
- RelativePath="..\common\teraterm.ico"
- >
- </File>
- <File
- RelativePath="ttpdlg-version.rc"
- >
- </File>
- <File
- RelativePath="ttpdlg.rc"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1041"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions=""
- Culture="1041"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Def File"
- >
- <File
- RelativePath="ttpdlg.def"
- >
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpfile/ttpfile.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -128,6 +128,8 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\common\dlglib.c" />
+ <ClCompile Include="..\common\dlglib_cpp.cpp" />
+ <ClCompile Include="..\common\dlglib_tmpl.cpp" />
<ClCompile Include="..\common\ttlib.c" />
<ClCompile Include="..\common\win16api.c" />
<ClCompile Include="bplus.c" />
@@ -170,4 +172,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -125,13 +125,12 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\common\codeconv.cpp" />
<ClCompile Include="..\common\i18n.c" />
- <ClCompile Include="..\common\stdafx.cpp" />
<ClCompile Include="..\common\ttlib.c" />
<ClCompile Include="..\common\win16api.c" />
<ClCompile Include="errdlg.cpp" />
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -34,9 +34,6 @@
<ClCompile Include="statdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\common\stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="ttmacro.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -231,10 +231,6 @@
>
</File>
<File
- RelativePath="..\common\stdafx.cpp"
- >
- </File>
- <File
RelativePath="ttmacro.cpp"
>
</File>
Modified: branches/cmake/ttpmenu/ttpmenu.v10.vcxproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v10.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.v10.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -113,7 +113,9 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\teraterm\common\codeconv.cpp" />
<ClCompile Include="..\teraterm\common\i18n.c" />
+ <ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="registry.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -120,7 +122,6 @@
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="ttpmenu.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -141,7 +142,10 @@
<None Include="ttpmenu.ico" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\teraterm\common\codeconv.h" />
+ <ClInclude Include="..\teraterm\common\i18n.h" />
<ClInclude Include="resource.h" />
+ <ClInclude Include="ttpmenu.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ttpmenu.rc" />
Modified: branches/cmake/ttpmenu/ttpmenu.v11.vcxproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v11.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.v11.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -117,12 +117,13 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\teraterm\common\codeconv.cpp" />
<ClCompile Include="..\teraterm\common\i18n.c" />
+ <ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="registry.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
</ClCompile>
- <ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="ttpmenu.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
@@ -139,7 +140,10 @@
<Image Include="ttpmenu.ico" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\teraterm\common\codeconv.h" />
+ <ClInclude Include="..\teraterm\common\i18n.h" />
<ClInclude Include="resource.h" />
+ <ClInclude Include="ttpmenu.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ttpmenu.rc" />
Modified: branches/cmake/ttpmenu/ttpmenu.v12.vcxproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v12.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.v12.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -117,6 +117,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\teraterm\common\codeconv.cpp" />
<ClCompile Include="..\teraterm\common\i18n.c" />
<ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
<Image Include="ttpmenu.ico" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\teraterm\common\codeconv.h" />
+ <ClInclude Include="..\teraterm\common\i18n.h" />
<ClInclude Include="resource.h" />
+ <ClInclude Include="ttpmenu.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ttpmenu.rc" />
Modified: branches/cmake/ttpmenu/ttpmenu.v14.vcxproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v14.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.v14.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -117,6 +117,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\teraterm\common\codeconv.cpp" />
<ClCompile Include="..\teraterm\common\i18n.c" />
<ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
<Image Include="ttpmenu.ico" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\teraterm\common\codeconv.h" />
+ <ClInclude Include="..\teraterm\common\i18n.h" />
<ClInclude Include="resource.h" />
+ <ClInclude Include="ttpmenu.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ttpmenu.rc" />
Modified: branches/cmake/ttpmenu/ttpmenu.v15.vcxproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v15.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -117,6 +117,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\teraterm\common\codeconv.cpp" />
<ClCompile Include="..\teraterm\common\i18n.c" />
<ClCompile Include="..\teraterm\common\ttlib.c" />
<ClCompile Include="registry.cpp">
@@ -139,7 +140,10 @@
<Image Include="ttpmenu.ico" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\teraterm\common\codeconv.h" />
+ <ClInclude Include="..\teraterm\common\i18n.h" />
<ClInclude Include="resource.h" />
+ <ClInclude Include="ttpmenu.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ttpmenu.rc" />
Modified: branches/cmake/ttpmenu/ttpmenu.v9.vcproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.v9.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.v9.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -193,6 +193,14 @@
</References>
<Files>
<File
+ RelativePath="..\teraterm\common\codeconv.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\teraterm\common\codeconv.h"
+ >
+ </File>
+ <File
RelativePath="..\teraterm\common\i18n.c"
>
</File>
Modified: branches/cmake/ttpmenu/ttpmenu.vcproj
===================================================================
--- branches/cmake/ttpmenu/ttpmenu.vcproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttpmenu/ttpmenu.vcproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -194,6 +194,14 @@
</References>
<Files>
<File
+ RelativePath="..\teraterm\common\codeconv.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\teraterm\common\codeconv.h"
+ >
+ </File>
+ <File
RelativePath="..\teraterm\common\i18n.c"
>
</File>
Modified: branches/cmake/ttssh2/putty/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/putty/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttssh2/putty/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -6,14 +6,29 @@
add_definitions("-D_WINDOWS")
endif()
-set(SRC
+set(PUTTY_SRC
+ ../../libs/putty/putty.h
+ ../../libs/putty/pageant.h
../../libs/putty/conf.c
+ ../../libs/putty/misc.h
../../libs/putty/misc.c
+ ../../libs/putty/tree234.h
../../libs/putty/tree234.c
+ ../../libs/putty/version.h
../../libs/putty/version.c
../../libs/putty/windows/winmisc.c
../../libs/putty/windows/winpgntc.c
+ ../../libs/putty/windows/winsecur.h
../../libs/putty/windows/winsecur.c
+ )
+
+source_group(
+ "putty"
+ FILES
+ ${PUTTY_SRC}
+ )
+
+set(SRC
libputty.c
libputty.h
)
@@ -27,4 +42,5 @@
add_library(
libputty
${SRC}
+ ${PUTTY_SRC}
)
Modified: branches/cmake/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2019-05-19 15:04:19 UTC (rev 7692)
@@ -148,6 +148,11 @@
### create puttyversion.h
+set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
+if(NOT EXISTS ${PUTTY_ISS})
+ message(FATAL_ERROR "${PUTTY_ISS} not found")
+endif()
+
file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})
Modified: branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj 2019-05-19 15:04:19 UTC (rev 7692)
@@ -141,6 +141,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\teraterm\common\tipwin.cpp" />
<ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
<ClCompile Include="..\matcher\matcher.c" />
<ClCompile Include="arc4random.c" />
@@ -228,4 +229,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
===================================================================
--- branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters 2019-05-19 15:03:52 UTC (rev 7691)
+++ branches/cmake/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters 2019-05-19 15:04:19 UTC (rev 7692)
@@ -94,6 +94,9 @@
<ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\teraterm\common\tipwin.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="arc4random.h">
@@ -221,4 +224,4 @@
<Filter>Def File</Filter>
</None>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file