• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7170 (tree)
Time2018-07-29 23:17:09
Authorzmatsuo

Log Message

libsフォルダでライブラリを生成、各プロジェクトから参照するようにした

Change Summary

Incremental Difference

--- branches/cmake/teraterm/ttptek/CMakeLists.txt (revision 7169)
+++ branches/cmake/teraterm/ttptek/CMakeLists.txt (revision 7170)
@@ -1,5 +1,8 @@
11 project(ttptek)
22
3+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
4+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
5+
36 if (MSVC)
47 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
58 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -29,14 +32,13 @@
2932 )
3033
3134 include_directories(
32- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
33- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
3435 ${CMAKE_CURRENT_SOURCE_DIR}/../common
36+ ${ONIGURUMA_INCLUDE}
37+ ${SFMT_INCLUDE_DIR}
3538 )
3639
3740 link_directories(
38- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
39- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
41+ ${SFMT_LIBRARY_DIRS}
4042 )
4143
4244 add_library(
@@ -47,10 +49,10 @@
4749 target_link_libraries(
4850 ttptek
4951 ttpcmn
50- optimized onig_s.lib
51- debug onig_sd.lib
52- optimized SFMT.lib
53- debug SFMTd.lib
52+# optimized onig.lib
53+# debug onigd.lib
54+ debug sfmtd.lib
55+ optimized sfmt.lib
5456 iphlpapi.lib
5557 )
5658
--- branches/cmake/teraterm/teraterm/CMakeLists.txt (revision 7169)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt (revision 7170)
@@ -1,5 +1,8 @@
11 project(teraterm)
22
3+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
4+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
5+
36 if (MSVC)
47 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
58 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -93,12 +96,13 @@
9396 include_directories(
9497 ../common
9598 ../ttpfile
99+ ${SFMT_INCLUDE_DIRS}
96100 .
97101 )
98102
99103 link_directories(
100- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
101- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
104+ ${ONIGURUMA_LIBRARY_DIRS}
105+ ${SFMT_LIBRARY_DIRS}
102106 )
103107
104108 set(CMAKE_MFC_FLAG 1)
@@ -123,8 +127,8 @@
123127 debug nafxcwd.lib
124128 optimized LIBCMT.lib
125129 debug LIBCMTD.lib
126- optimized onig_s.lib
127- debug onig_sd.lib
130+ optimized onig.lib
131+ debug onigd.lib
128132 ws2_32.lib
129133 imm32.lib
130134 imagehlp.lib
--- branches/cmake/teraterm/ttpmacro/CMakeLists.txt (revision 7169)
+++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt (revision 7170)
@@ -1,5 +1,8 @@
11 project(ttpmacro)
22
3+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
4+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
5+
36 if (MSVC)
47 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
58 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -60,14 +63,14 @@
6063 )
6164
6265 include_directories(
63- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
64- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
66+ ${ONIGURUMA_INCLUDE_DIRS}
67+ ${SFMT_INCLUDE_DIRS}
6568 ${CMAKE_CURRENT_SOURCE_DIR}/../common
6669 )
6770
6871 link_directories(
69- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
70- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/SFMT
72+ ${ONIGURUMA_LIBRARY_DIRS}
73+ ${SFMT_LIBRARY_DIRS}
7174 )
7275
7376 set(CMAKE_MFC_FLAG 1)
@@ -88,10 +91,10 @@
8891 debug nafxcwd.lib
8992 optimized LIBCMT.lib
9093 debug LIBCMTD.lib
91- optimized onig_s.lib
92- debug onig_sd.lib
93- optimized SFMT.lib
94- debug SFMTd.lib
94+ optimized onig.lib
95+ debug onigd.lib
96+ optimized sfmt.lib
97+ debug sfmtd.lib
9598 iphlpapi.lib
9699 )
97100
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt (revision 7169)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt (revision 7170)
@@ -1,5 +1,7 @@
11 project(ttpdlg)
22
3+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
4+
35 if (MSVC)
46 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
57 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
@@ -31,13 +33,13 @@
3133 )
3234
3335 include_directories(
34- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
3536 ${CMAKE_CURRENT_SOURCE_DIR}/../common
3637 ${CMAKE_CURRENT_BINARY_DIR}
38+ ${ONIGURUMA_INCLUDE_DIRS}
3739 )
3840
3941 link_directories(
40- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/oniguruma/src
42+ ${ONIGURUMA_LIBRARY_DIRS}
4143 )
4244
4345 add_library(
@@ -48,8 +50,8 @@
4850 target_link_libraries(
4951 ttpdlg
5052 ttpcmn
51- optimized onig_s.lib
52- debug onig_sd.lib
53+ optimized onig.lib
54+ debug onigd.lib
5355 )
5456
5557 add_dependencies(
@@ -58,8 +60,9 @@
5860 )
5961
6062 ## svnversion.h
61-INCLUDE(FindSubversion)
62-
63+if(EXISTS ${CMAKE_SOURCE_DIR}/.svn)
64+ INCLUDE(FindSubversion)
65+endif()
6366 if(Subversion_FOUND)
6467 Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
6568 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n")
--- branches/cmake/ttssh2/ttxssh/CMakeLists.txt (revision 7169)
+++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt (revision 7170)
@@ -2,6 +2,9 @@
22
33 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
44
5+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_zlib.cmake)
6+include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_openssl.cmake)
7+
58 set(SRC
69 ${CMAKE_CURRENT_BINARY_DIR}/puttyversion.h
710 ../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
@@ -72,15 +75,14 @@
7275 include_directories(
7376 ../../teraterm/teraterm
7477 ../../teraterm/common
75- ../../libs/openssl/inc32
76- ../../libs/zlib
7778 ../matcher
7879 ../putty
80+ ${OPENSSL_INCLUDE_DIRS}
81+ ${ZLIB_INCLUDE_DIRS}
7982 )
8083
8184 link_directories(
82- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/openssl/out32
83- ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/zlib
85+ ${ZLIB_LIBRARY_DIRS}
8486 )
8587
8688 add_library(
@@ -92,8 +94,9 @@
9294 ttxssh
9395 libputty
9496 ttpcmn
95- libeay32.lib
96- zlib.lib
97+ debug zlibstaticd.lib
98+ optimized zlibstatic.lib
99+ ${OPENSSL_LIB}
97100 ws2_32.lib
98101 dnsapi.lib
99102 )
--- branches/cmake/TTProxy/CMakeLists.txt (revision 7169)
+++ branches/cmake/TTProxy/CMakeLists.txt (revision 7170)
@@ -2,6 +2,8 @@
22
33 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
44
5+include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake)
6+
57 set(SRC
68 ../teraterm/common/ttlib.c
79 ../teraterm/common/ttlib.h
@@ -26,7 +28,7 @@
2628 ../teraterm/teraterm
2729 ../teraterm/common
2830 YCL/include
29- ../libs/openssl/inc32
31+ ${OPENSSL_INCLUDE_DIRS}
3032 .
3133 )
3234
--- branches/cmake/libs/buildall_cmake.bat (revision 7169)
+++ branches/cmake/libs/buildall_cmake.bat (revision 7170)
@@ -1,4 +1,30 @@
1-setlocal
2-cmake -P buildall.cmake
3-endlocal
4-pause
1+@echo off
2+setlocal
3+
4+:retry
5+echo 1. Visual Studio 15 2017
6+echo 2. Visual Studio 14 2015
7+echo 3. Visual Studio 12 2013
8+echo 4. Visual Studio 11 2012
9+echo 5. Visual Studio 10 2010
10+echo 6. Visual Studio 9 2008
11+echo 7. Visual Studio 8 2005
12+set /p no="select no "
13+
14+echo %no%
15+if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & goto build_all
16+if "%no%" == "2" set GENERATOR="Visual Studio 14 2015" & goto build_all
17+if "%no%" == "3" set GENERATOR="Visual Studio 12 2013" & goto build_all
18+if "%no%" == "4" set GENERATOR="Visual Studio 11 2012" & goto build_all
19+if "%no%" == "5" set GENERATOR="Visual Studio 10 2010" & goto build_all
20+if "%no%" == "6" set GENERATOR="Visual Studio 9 2008" & goto build_all
21+if "%no%" == "7" set GENERATOR="Visual Studio 8 2005" & goto build_all
22+echo ? retry
23+goto retry
24+
25+:build_all
26+echo cmake -DGENERATOR=%GENERATOR% -P buildall.cmake
27+pause
28+cmake -DGENERATOR=%GENERATOR% -P buildall.cmake
29+endlocal
30+pause
Show on old repository browser