• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8568 (tree)
Time2020-02-27 01:27:26
Authorzmatsuo

Log Message

common_static.lib にあるファイルは複数回ビルドしないようにした

Change Summary

Incremental Difference

--- trunk/TTProxy/CMakeLists.txt (revision 8567)
+++ trunk/TTProxy/CMakeLists.txt (revision 8568)
@@ -6,17 +6,12 @@
66
77 set(COMMON_SRC
88 ../teraterm/common/ttlib.h
9- ../teraterm/common/ttlib.c
109 ../teraterm/common/i18n.h
1110 ../teraterm/common/ttplugin.h
1211 ../teraterm/common/tttypes.h
1312 ../teraterm/common/tt-version.h
1413 ../teraterm/common/codeconv.h
15- ../teraterm/common/codeconv.cpp
1614 ../teraterm/common/dlglib.h
17- ../teraterm/common/dlglib.c
18- ../teraterm/common/dlglib_cpp.cpp
19- ../teraterm/common/dlglib_tmpl.cpp
2015 ../teraterm/teraterm/ttdialog.h
2116 ../teraterm/teraterm/ttfileio.h
2217 ../teraterm/teraterm/ttsetup.h
--- trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt (revision 8567)
+++ trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt (revision 8568)
@@ -15,10 +15,6 @@
1515 #
1616 ../../teraterm/common/codeconv.h
1717 ../../teraterm/common/dlglib.h
18- ../../teraterm/common/dlglib.c
19- ../../teraterm/common/dlglib_cpp.cpp
20- ../../teraterm/common/dlglib_tmpl.cpp
21- ../../teraterm/common/ttlib.c
2218 ../../teraterm/common/getcontent.h
2319 )
2420
--- trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt (revision 8567)
+++ trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt (revision 8568)
@@ -4,10 +4,6 @@
44
55 set(COMMON_SRC
66 ../../teraterm/common/dlglib.h
7- ../../teraterm/common/dlglib.c
8- ../../teraterm/common/dlglib_cpp.cpp
9- ../../teraterm/common/dlglib_tmpl.cpp
10- ../../teraterm/common/ttlib.c
117 )
128
139 source_group(
--- trunk/TTXSamples/TTXViewMode/CMakeLists.txt (revision 8567)
+++ trunk/TTXSamples/TTXViewMode/CMakeLists.txt (revision 8568)
@@ -4,10 +4,6 @@
44
55 set(COMMON_SRC
66 ../../teraterm/common/dlglib.h
7- ../../teraterm/common/dlglib.c
8- ../../teraterm/common/dlglib_cpp.cpp
9- ../../teraterm/common/dlglib_tmpl.cpp
10- ../../teraterm/common/ttlib.c
117 )
128
139 source_group(
--- trunk/teraterm/common/CMakeLists.txt (revision 8567)
+++ trunk/teraterm/common/CMakeLists.txt (revision 8568)
@@ -15,8 +15,8 @@
1515 dllutil.h
1616 getcontent.cpp
1717 getcontent.h
18- i18n.c
1918 i18n_static.c
19+ i18n_static.c
2020 i18n.h
2121 layer_for_unicode.cpp
2222 layer_for_unicode.h
--- trunk/teraterm/teraterm/CMakeLists.txt (revision 8567)
+++ trunk/teraterm/teraterm/CMakeLists.txt (revision 8568)
@@ -112,27 +112,16 @@
112112 ../common/ttlib.c
113113 ../common/ttlib.h
114114 ../common/dlglib.h
115- ../common/dlglib.c
116- ../common/dlglib_cpp.cpp
117- ../common/dlglib_tmpl.cpp
118115 ../common/win16api.h
119- ../common/win16api.c
120116 ../common/codemap.h
121117 ../common/compat_w95.h
122118 ../common/compat_win.h
123- ../common/compat_win.cpp
124- ../common/tmfc.cpp
125119 ../common/tmfc.h
126- ../common/tmfc_frame.cpp
127120 ../common/i18n.h
128- ../common/dllutil.cpp
129121 ../common/dllutil.h
130122 ../common/codeconv.h
131- ../common/codeconv.cpp
132123 ../common/tipwin.h
133- ../common/tipwin.cpp
134124 ../common/layer_for_unicode.h
135- ../common/layer_for_unicode.cpp
136125 #
137126 ../teraterm/unisym2decsp.map
138127 ../teraterm/uni2sjis.map
@@ -235,14 +224,6 @@
235224 uuid
236225 )
237226
238-add_dependencies(
239- teraterm
240- ttpcmn
241- ttpfile
242- ttpset
243- ttptek
244- )
245-
246227 ####
247228 configure_file(
248229 svnversion.h.in
--- trunk/teraterm/ttpcmn/CMakeLists.txt (revision 8567)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt (revision 8568)
@@ -6,6 +6,7 @@
66 ../common/teraterm.h
77 ../common/tttypes.h
88 ../common/i18n.h
9+ ../common/i18n.c
910 ../common/ttlib.c
1011 ../common/ttlib.h
1112 ../common/servicenames.c
--- trunk/teraterm/ttpfile/CMakeLists.txt (revision 8567)
+++ trunk/teraterm/ttpfile/CMakeLists.txt (revision 8568)
@@ -3,14 +3,10 @@
33 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
44
55 set(COMMON_SRC
6- ../common/dlglib.c
76 ../common/dlglib.h
8- ../common/dlglib_cpp.cpp
9- ../common/dlglib_tmpl.cpp
7+ ../common/ttlib.h
108 ../common/ttlib.c
11- ../common/ttlib.h
129 ../common/win16api.h
13- ../common/win16api.c
1410 )
1511
1612 source_group(
--- trunk/teraterm/ttpmacro/CMakeLists.txt (revision 8567)
+++ trunk/teraterm/ttpmacro/CMakeLists.txt (revision 8568)
@@ -62,24 +62,13 @@
6262 ../common/i18n.h
6363 ../common/ttlib.c
6464 ../common/ttlib.h
65- ../common/tmfc.cpp
6665 ../common/tmfc.h
67- ../common/tmfc_frame.cpp
68- ../common/dlglib.h
69- ../common/dlglib.c
70- ../common/dlglib_tmpl.cpp
71- ../common/dlglib_cpp.cpp
7266 ../common/compat_w95.h
7367 ../common/compat_win.h
74- ../common/compat_win.cpp
7568 ../common/win16api.h
76- ../common/win16api.c
7769 ../common/codeconv.h
78- ../common/codeconv.cpp
7970 ../common/dllutil.h
80- ../common/dllutil.cpp
8171 ../common/layer_for_unicode.h
82- ../common/layer_for_unicode.cpp
8372 )
8473
8574 source_group(
--- trunk/teraterm/ttptek/CMakeLists.txt (revision 8567)
+++ trunk/teraterm/ttptek/CMakeLists.txt (revision 8568)
@@ -8,7 +8,6 @@
88 ../common/ttlib.c
99 ../common/ttlib.h
1010 ../common/codeconv.h
11- ../common/codeconv.cpp
1211 )
1312
1413 source_group(
--- trunk/ttssh2/ttxssh/CMakeLists.txt (revision 8567)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt (revision 8568)
@@ -87,23 +87,14 @@
8787 ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
8888 ../../teraterm/common/ttcommon.h
8989 ../../teraterm/common/i18n.h
90- ../../teraterm/common/i18n_static.c
9190 ../../teraterm/common/ttlib.h
9291 ../../teraterm/common/ttlib.c
9392 ../../teraterm/common/dlglib.h
94- ../../teraterm/common/dlglib.c
95- ../../teraterm/common/dlglib_cpp.cpp
96- ../../teraterm/common/dlglib_tmpl.cpp
9793 ../../teraterm/common/servicenames.h
98- ../../teraterm/common/codeconv.cpp
9994 ../../teraterm/common/codeconv.h
100- ../../teraterm/common/tipwin.cpp
10195 ../../teraterm/common/tipwin.h
102- ../../teraterm/common/layer_for_unicode.cpp
10396 ../../teraterm/common/layer_for_unicode.h
104- ../../teraterm/common/compat_win.cpp
10597 ../../teraterm/common/compat_win.h
106- ../../teraterm/common/dllutil.cpp
10798 ../../teraterm/common/dllutil.h
10899 )
109100
Show on old repository browser