Tera TermRevision: 7531
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7531
Author: zmatsuo
Date: 2019-03-29 22:34:43 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
VS2005 Express 対応
Modified Paths:
--------------
trunk/TTProxy/TTProxy.rc
trunk/TTXKanjiMenu/ttxkanjimenu.rc
trunk/teraterm/CMakeLists.txt
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/ttpcmn/CMakeLists.txt
trunk/teraterm/ttptek/CMakeLists.txt
trunk/ttpmenu/ttpmenu.rc
trunk/ttssh2/ttssh/ttssh.rc
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.rc
===================================================================
--- trunk/TTProxy/TTProxy.rc 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/TTProxy/TTProxy.rc 2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include <winres.h>
+//#include <winres.h>
#include <winnt.rh>
#include <winuser.rh>
#include <commctrl.rh>
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.rc
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.rc 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.rc 2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Modified: trunk/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/CMakeLists.txt 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/CMakeLists.txt 2019-03-29 13:34:43 UTC (rev 7531)
@@ -14,10 +14,13 @@
ttpset
PROPERTIES FOLDER teraterm)
-add_subdirectory(ttpmacro)
-set_target_properties(
- ttpmacro
- PROPERTIES FOLDER teraterm)
+if(NOT(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005" AND ${CMAKE_MAKE_PROGRAM} MATCHES "VCExpress.exe"))
+ # MFCを使用しているため VS2005 Express ではビルドできない
+ add_subdirectory(ttpmacro)
+ set_target_properties(
+ ttpmacro
+ PROPERTIES FOLDER teraterm)
+endif()
add_subdirectory(ttptek)
set_target_properties(
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/teraterm/ttermpro.rc 2019-03-29 13:34:43 UTC (rev 7531)
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "..\common\tt_res.h"
+#include "tt_res.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -7,8 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
-
+#include <winresrc.h>
+#define IDC_STATIC -1
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -461,13 +461,13 @@
1 TEXTINCLUDE
BEGIN
- "..\\common\\tt_res.h\0"
+ "tt_res.h\0"
END
2 TEXTINCLUDE
BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
+ "#include <winresrc.h>\r\n"
+ "#define IDC_STATIC -1\0"
END
3 TEXTINCLUDE
Modified: trunk/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpcmn/CMakeLists.txt 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt 2019-03-29 13:34:43 UTC (rev 7531)
@@ -36,7 +36,6 @@
language.h
ttcmn.c
ttpcmn-version.rc
- ttpcmn.rc
${COMMON_SRC}
)
Modified: trunk/teraterm/ttptek/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttptek/CMakeLists.txt 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/teraterm/ttptek/CMakeLists.txt 2019-03-29 13:34:43 UTC (rev 7531)
@@ -26,7 +26,6 @@
tekesc.c
tekesc.h
ttptek.def
- ttptek.rc
ttptek-version.rc
tttek.h
tttek.c
Modified: trunk/ttpmenu/ttpmenu.rc
===================================================================
--- trunk/ttpmenu/ttpmenu.rc 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/ttpmenu/ttpmenu.rc 2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,7 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Modified: trunk/ttssh2/ttssh/ttssh.rc
===================================================================
--- trunk/ttssh2/ttssh/ttssh.rc 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/ttssh2/ttssh/ttssh.rc 2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+//#include "afxres.h"
+#include <windows.h>
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2019-03-29 13:34:29 UTC (rev 7530)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2019-03-29 13:34:43 UTC (rev 7531)
@@ -7,7 +7,10 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "afxres.h"
+#include <windows.h>
+#ifndef IDC_STATIC
+#define IDC_STATIC -1
+#endif
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS