• R/O
  • SSH
  • HTTPS

ttssh2: コミット


コミットメタ情報

リビジョン7171 (tree)
日時2018-08-01 00:28:11
作者zmatsuo

ログメッセージ

single configuration に対応

cmake .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release などができるようになった

うまくbuildできないことがあったので修正
次の2ファイルはデバッグオプションなどがなくなっていたので修正

teraterm/teraterm/CMakeLists.txt
teraterm/ttpmacro/CMakeLists.txt

変更サマリ

差分

--- branches/cmake/CMakeLists.txt (revision 7170)
+++ branches/cmake/CMakeLists.txt (revision 7171)
@@ -12,7 +12,7 @@
1212 string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
1313 string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
1414 string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
15-if(CMAKE_GENERATOR MATCHES "Visual Studio 15 2017")
15+if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
1616 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
1717 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
1818 endif()
@@ -22,6 +22,6 @@
2222 add_subdirectory(TTProxy)
2323 add_subdirectory(ttssh2)
2424 add_subdirectory(TTXKanjiMenu)
25-if(ENABLE_TTXSAMPLES)
25+if(${ENABLE_TTXSAMPLES})
2626 add_subdirectory(TTXSamples)
2727 endif()
--- branches/cmake/libs/buildall_cmake.bat (revision 7170)
+++ branches/cmake/libs/buildall_cmake.bat (revision 7171)
@@ -1,6 +1,7 @@
11 @echo off
22 setlocal
33
4+set opt=
45 :retry
56 echo 1. Visual Studio 15 2017
67 echo 2. Visual Studio 14 2015
@@ -9,6 +10,8 @@
910 echo 5. Visual Studio 10 2010
1011 echo 6. Visual Studio 9 2008
1112 echo 7. Visual Studio 8 2005
13+echo 9. Visual Studio NMake
14+echo z. Cygwin MinGW Release + Unix Makefiles
1215 set /p no="select no "
1316
1417 echo %no%
@@ -19,12 +22,16 @@
1922 if "%no%" == "5" set GENERATOR="Visual Studio 10 2010" & goto build_all
2023 if "%no%" == "6" set GENERATOR="Visual Studio 9 2008" & goto build_all
2124 if "%no%" == "7" set GENERATOR="Visual Studio 8 2005" & goto build_all
25+if "%no%" == "9" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
26+if "%no%" == "z" set GENERATOR="Unix Makefiles" & goto build_all
2227 echo ? retry
2328 goto retry
2429
2530 :build_all
26-echo cmake -DGENERATOR=%GENERATOR% -P buildall.cmake
31+set C=cmake -DCMAKE_GENERATOR=%GENERATOR% %OPT% -P buildall.cmake
32+echo %C%
33+title %C%
2734 pause
28-cmake -DGENERATOR=%GENERATOR% -P buildall.cmake
35+%C%
2936 endlocal
3037 pause
--- branches/cmake/teraterm/teraterm/CMakeLists.txt (revision 7170)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt (revision 7171)
@@ -107,9 +107,9 @@
107107
108108 set(CMAKE_MFC_FLAG 1)
109109
110-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
111-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
112-set(CMAKE_EXE_LINKER_FLAGS "/DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
110+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
111+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
112+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
113113
114114 add_executable(
115115 teraterm WIN32
@@ -132,6 +132,7 @@
132132 ws2_32.lib
133133 imm32.lib
134134 imagehlp.lib
135+ delayimp.lib
135136 )
136137
137138 add_dependencies(
--- branches/cmake/teraterm/ttpmacro/CMakeLists.txt (revision 7170)
+++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt (revision 7171)
@@ -75,9 +75,9 @@
7575
7676 set(CMAKE_MFC_FLAG 1)
7777
78-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
79-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
80-set(CMAKE_EXE_LINKER_FLAGS "/DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll")
78+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
79+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
80+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll")
8181
8282 add_executable(
8383 ttpmacro WIN32
@@ -96,6 +96,7 @@
9696 optimized sfmt.lib
9797 debug sfmtd.lib
9898 iphlpapi.lib
99+ delayimp.lib
99100 )
100101
101102 add_dependencies(
旧リポジトリブラウザで表示