• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7391 (tree)
Time2019-01-13 18:35:20
Authorzmatsuo

Log Message

manifestファイルをプロジェクトに追加

Change Summary

Incremental Difference

--- branches/cmake/teraterm/teraterm/CMakeLists.txt (revision 7390)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt (revision 7391)
@@ -1,216 +1,218 @@
1-project(teraterm)
2-
3-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
4-include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
5-
6-if (MSVC)
7- string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
8- string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
9- string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
10- string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
11-endif ()
12-
13-
14-if(USE_UNICODE_API)
15- add_definitions(-DUNICODE -D_UNICODE)
16-endif()
17-if(LINK_UNICOWS)
18-# set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/unicows_mingw/liblibunicows.a")
19- set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/libunicows-1.1.2-msvc6/unicows.lib")
20-endif()
21-
22-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
23-
24-set(COMMON_SRC
25- ../common/tt_res.h
26- ../common/ttcommon.h
27- ../common/ttddecmnd.h
28- ../common/tttypes.h
29- ../common/ttftypes.h
30- ../common/ttplugin.h
31- ../common/tt-version.h
32- ../common/teraterm.h
33- ../common/ttlib.c
34- ../common/ttlib.h
35- ../common/dlglib.c
36- ../common/dlglib_cpp.cpp
37- ../common/dlglib.h
38- ../common/dlglib_tmpl.cpp
39- ../common/compat_win.cpp
40- ../common/compat_win.h
41- ../common/tmfc.cpp
42- ../common/tmfc.h
43- ../common/tmfc_frame.cpp
44- ../common/i18n.c
45- ../common/i18n.h
46- ../common/win16api.h
47- ../common/win16api.c
48- ../common/codeconv.h
49- ../common/codeconv.cpp
50- )
51-
52-source_group(
53- "common"
54- FILES
55- ${COMMON_SRC}
56- )
57-
58-set(TTDLG_SRC
59- ../ttpdlg/dlg_res.h
60- ../ttpdlg/ttdlg.c
61- ../ttpdlg/ttpdlg.rc
62- )
63-
64-source_group(
65- "ttdlg"
66- FILES
67- ${TTDLG_SRC}
68- )
69-
70-set(SRC
71- addsetting.cpp
72- addsetting.h
73- buffer.c
74- buffer.h
75- clipboar.c
76- clipboar.h
77- commlib.c
78- commlib.h
79- dnddlg.cpp
80- dnddlg.h
81- dnddlg.rc
82- filesys.cpp
83- filesys.h
84- ftdlg.cpp
85- ftdlg.h
86- keyboard.c
87- keyboard.h
88- prnabort.cpp
89- prnabort.h
90- protodlg.cpp
91- protodlg.h
92- sizetip.c
93- sizetip.h
94- teklib.c
95- teklib.h
96- tekwin.cpp
97- tekwin.h
98- telnet.c
99- telnet.h
100- teraapp.h
101- teraprn.cpp
102- teraprn.h
103- teraterm.cpp
104- ttdde.c
105- ttdde.h
106- ttdialog.c
107- ttdialog.h
108- ttermpro.rc
109- ttfileio.c
110- ttfileio.h
111- ttime.c
112- ttime.h
113- ttplug.c
114- ttplug.h
115- ttsetup.c
116- ttsetup.h
117- ttwinman.c
118- ttwinman.h
119- ttwsk.c
120- ttwsk.h
121- vtdisp.c
122- vtdisp.h
123- vtterm.c
124- vtterm.h
125- vtwin.cpp
126- vtwin.h
127- winjump.c
128- winjump.h
129- WSAAsyncGetAddrInfo.c
130- WSAAsyncGetAddrInfo.h
131- ttutil.c
132- ttutil.h
133- #
134- ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
135- #
136- ${COMMON_SRC}
137- ${TTDLG_SRC}
138- )
139-
140-include_directories(
141- ../common
142- ../ttpfile
143- ../ttpdlg
144- ${SFMT_INCLUDE_DIRS}
145- ${ONIGURUMA_INCLUDE_DIRS}
146- .
147- ${CMAKE_CURRENT_BINARY_DIR}
148- )
149-
150-link_directories(
151- ${ONIGURUMA_LIBRARY_DIRS}
152- ${SFMT_LIBRARY_DIRS}
153- )
154-
155-if (MSVC)
156- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
157-endif()
158-
159-if(MINGW)
160- link_directories(
161- ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
162- )
163-endif()
164-
165-add_executable(
166- teraterm WIN32
167- ${SRC}
168- )
169-
170-set_target_properties(
171- teraterm
172- PROPERTIES
173- OUTPUT_NAME "ttermpro"
174- )
175-
176-target_link_libraries(
177- teraterm
178- ${UNICOWS_LIB}
179- ttpcmn
180- ttpfile
181- ttpset
182- ttptek
183-# ttpdlg
184- optimized onig
185- debug onigd
186- #
187- gdi32
188- comctl32
189- ws2_32
190- imm32
191- imagehlp
192- delayimp
193- oleaut32
194- uuid
195- )
196-
197-add_dependencies(
198- teraterm
199- ttpcmn
200-# ttpdlg
201- ttpfile
202- ttpset
203- ttptek
204- )
205-
206-## svnversion.h
207-if(EXISTS ${CMAKE_SOURCE_DIR}/.svn)
208- INCLUDE(FindSubversion)
209-endif()
210-if(Subversion_FOUND)
211- Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
212- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n")
213- message("rev.${TT_WC_REVISION}")
214-else()
215- FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#undef SVNVERSION\n")
216-endif()
1+project(teraterm)
2+
3+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
4+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
5+
6+if (MSVC)
7+ string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
8+ string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
9+ string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
10+ string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
11+endif ()
12+
13+
14+if(USE_UNICODE_API)
15+ add_definitions(-DUNICODE -D_UNICODE)
16+endif()
17+if(LINK_UNICOWS)
18+# set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/unicows_mingw/liblibunicows.a")
19+ set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/libunicows-1.1.2-msvc6/unicows.lib")
20+endif()
21+
22+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
23+
24+set(COMMON_SRC
25+ ../common/tt_res.h
26+ ../common/ttcommon.h
27+ ../common/ttddecmnd.h
28+ ../common/tttypes.h
29+ ../common/ttftypes.h
30+ ../common/ttplugin.h
31+ ../common/tt-version.h
32+ ../common/teraterm.h
33+ ../common/ttlib.c
34+ ../common/ttlib.h
35+ ../common/dlglib.c
36+ ../common/dlglib_cpp.cpp
37+ ../common/dlglib.h
38+ ../common/dlglib_tmpl.cpp
39+ ../common/compat_win.cpp
40+ ../common/compat_win.h
41+ ../common/tmfc.cpp
42+ ../common/tmfc.h
43+ ../common/tmfc_frame.cpp
44+ ../common/i18n.c
45+ ../common/i18n.h
46+ ../common/win16api.h
47+ ../common/win16api.c
48+ ../common/codeconv.h
49+ ../common/codeconv.cpp
50+ )
51+
52+source_group(
53+ "common"
54+ FILES
55+ ${COMMON_SRC}
56+ )
57+
58+set(TTDLG_SRC
59+ ../ttpdlg/dlg_res.h
60+ ../ttpdlg/ttdlg.c
61+ ../ttpdlg/ttpdlg.rc
62+ )
63+
64+source_group(
65+ "ttdlg"
66+ FILES
67+ ${TTDLG_SRC}
68+ )
69+
70+set(SRC
71+ addsetting.cpp
72+ addsetting.h
73+ buffer.c
74+ buffer.h
75+ clipboar.c
76+ clipboar.h
77+ commlib.c
78+ commlib.h
79+ dnddlg.cpp
80+ dnddlg.h
81+ dnddlg.rc
82+ filesys.cpp
83+ filesys.h
84+ ftdlg.cpp
85+ ftdlg.h
86+ keyboard.c
87+ keyboard.h
88+ prnabort.cpp
89+ prnabort.h
90+ protodlg.cpp
91+ protodlg.h
92+ sizetip.c
93+ sizetip.h
94+ teklib.c
95+ teklib.h
96+ tekwin.cpp
97+ tekwin.h
98+ telnet.c
99+ telnet.h
100+ teraapp.h
101+ teraprn.cpp
102+ teraprn.h
103+ teraterm.cpp
104+ ttdde.c
105+ ttdde.h
106+ ttdialog.c
107+ ttdialog.h
108+ ttermpro.rc
109+ ttfileio.c
110+ ttfileio.h
111+ ttime.c
112+ ttime.h
113+ ttplug.c
114+ ttplug.h
115+ ttsetup.c
116+ ttsetup.h
117+ ttwinman.c
118+ ttwinman.h
119+ ttwsk.c
120+ ttwsk.h
121+ vtdisp.c
122+ vtdisp.h
123+ vtterm.c
124+ vtterm.h
125+ vtwin.cpp
126+ vtwin.h
127+ winjump.c
128+ winjump.h
129+ WSAAsyncGetAddrInfo.c
130+ WSAAsyncGetAddrInfo.h
131+ ttutil.c
132+ ttutil.h
133+ #
134+ teraterm.manifest
135+ #
136+ ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
137+ #
138+ ${COMMON_SRC}
139+ ${TTDLG_SRC}
140+ )
141+
142+include_directories(
143+ ../common
144+ ../ttpfile
145+ ../ttpdlg
146+ ${SFMT_INCLUDE_DIRS}
147+ ${ONIGURUMA_INCLUDE_DIRS}
148+ .
149+ ${CMAKE_CURRENT_BINARY_DIR}
150+ )
151+
152+link_directories(
153+ ${ONIGURUMA_LIBRARY_DIRS}
154+ ${SFMT_LIBRARY_DIRS}
155+ )
156+
157+if (MSVC)
158+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
159+endif()
160+
161+if(MINGW)
162+ link_directories(
163+ ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
164+ )
165+endif()
166+
167+add_executable(
168+ teraterm WIN32
169+ ${SRC}
170+ )
171+
172+set_target_properties(
173+ teraterm
174+ PROPERTIES
175+ OUTPUT_NAME "ttermpro"
176+ )
177+
178+target_link_libraries(
179+ teraterm
180+ ${UNICOWS_LIB}
181+ ttpcmn
182+ ttpfile
183+ ttpset
184+ ttptek
185+# ttpdlg
186+ optimized onig
187+ debug onigd
188+ #
189+ gdi32
190+ comctl32
191+ ws2_32
192+ imm32
193+ imagehlp
194+ delayimp
195+ oleaut32
196+ uuid
197+ )
198+
199+add_dependencies(
200+ teraterm
201+ ttpcmn
202+# ttpdlg
203+ ttpfile
204+ ttpset
205+ ttptek
206+ )
207+
208+## svnversion.h
209+if(EXISTS ${CMAKE_SOURCE_DIR}/.svn)
210+ INCLUDE(FindSubversion)
211+endif()
212+if(Subversion_FOUND)
213+ Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
214+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n")
215+ message("rev.${TT_WC_REVISION}")
216+else()
217+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#undef SVNVERSION\n")
218+endif()
--- branches/cmake/teraterm/teraterm/teraterm.manifest (revision 7390)
+++ branches/cmake/teraterm/teraterm/teraterm.manifest (revision 7391)
@@ -9,7 +9,7 @@
99 type="win32"
1010 name="Microsoft.Windows.Common-Controls"
1111 version="6.0.0.0"
12- processorArchitecture="X86"
12+ processorArchitecture="*"
1313 publicKeyToken="6595b64144ccf1df"
1414 language="*"
1515 />
Show on old repository browser