Revision: 7414 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7414 Author: zmatsuo Date: 2019-01-28 23:15:01 +0900 (Mon, 28 Jan 2019) Log Message: ----------- CmakeLists.txt を UTF-8 BOM CRLFに統一した Modified Paths: -------------- branches/cmake/TTProxy/CMakeLists.txt branches/cmake/TTXKanjiMenu/CMakeLists.txt branches/cmake/TTXSamples/CMakeLists.txt branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt branches/cmake/TTXSamples/ttxtest/CMakeLists.txt branches/cmake/libs/putty.cmake branches/cmake/teraterm/keycode/CMakeLists.txt branches/cmake/teraterm/svnrev/CMakeLists.txt branches/cmake/teraterm/ttpcmn/CMakeLists.txt branches/cmake/teraterm/ttpdlg/CMakeLists.txt branches/cmake/teraterm/ttpfile/CMakeLists.txt branches/cmake/teraterm/ttpmacro/CMakeLists.txt branches/cmake/teraterm/ttpset/CMakeLists.txt branches/cmake/teraterm/ttptek/CMakeLists.txt branches/cmake/ttpmenu/CMakeLists.txt branches/cmake/ttssh2/CMakeLists.txt branches/cmake/ttssh2/matcher/CMakeLists.txt branches/cmake/ttssh2/putty/CMakeLists.txt branches/cmake/ttssh2/puttyrev/CMakeLists.txt branches/cmake/ttssh2/ttssh/CMakeLists.txt branches/cmake/ttssh2/ttxssh/CMakeLists.txt -------------- next part -------------- Modified: branches/cmake/TTProxy/CMakeLists.txt =================================================================== --- branches/cmake/TTProxy/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTProxy/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,122 +1,122 @@ -project(ttproxy) - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -if(MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") -endif() - -include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake) - -set(COMMON_SRC - ../teraterm/common/ttlib.h - ../teraterm/common/i18n.h - ../teraterm/common/ttplugin.h - ../teraterm/common/tttypes.h - ../teraterm/common/tt-version.h - ../teraterm/common/codeconv.h - ../teraterm/common/codeconv.cpp - ../teraterm/common/dlglib.h - ../teraterm/common/dlglib.c - ../teraterm/common/dlglib_cpp.cpp - ../teraterm/common/dlglib_tmpl.cpp - ../teraterm/teraterm/ttdialog.h - ../teraterm/teraterm/ttfileio.h - ../teraterm/teraterm/ttsetup.h - ../teraterm/teraterm/ttwsk.h - ) -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(YCL_SRC - YCL/include/YCL/Array.h - YCL/include/YCL/ComboBoxCtrl.h - YCL/include/YCL/common.h - YCL/include/YCL/Dialog.h - YCL/include/YCL/DynamicLinkLibrary.h - YCL/include/YCL/EditBoxCtrl.h - YCL/include/YCL/Enumeration.h - YCL/include/YCL/FileVersion.h - YCL/include/YCL/HASHCODE.h - YCL/include/YCL/Hashtable.h - YCL/include/YCL/IniFile.h - YCL/include/YCL/Integer.h - YCL/include/YCL/Object.h - YCL/include/YCL/Pointer.h - YCL/include/YCL/Resource.h - YCL/include/YCL/String.h - YCL/include/YCL/StringBuffer.h - YCL/include/YCL/StringUtil.h - YCL/include/YCL/ValueCtrl.h - YCL/include/YCL/Vector.h - YCL/include/YCL/Window.h - ) -source_group( - "YCL" - FILES - ${YCL_SRC} - ) - -set(SRC - Hooker.h - Logger.h - ProxyWSockHook.h - resource.h - SSLLIB.h - SSLSocket.h - StdAfx.cpp - StdAfx.h - TTProxy.cpp - TTProxy.h - TTProxy.rc - ) - -include_directories( - ../teraterm/teraterm - ../teraterm/common - YCL/include - ${OPENSSL_INCLUDE_DIRS} - . - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-uTTXBind @ 8") - -add_library( - ttproxy SHARED - ${SRC} - ${COMMON_SRC} - ${YCL_SRC} - ) - -set_target_properties( - ttproxy - PROPERTIES - PREFIX "" - OUTPUT_NAME "TTXProxy" - ) - -target_link_libraries( - ttproxy - ttpcmn - # - ws2_32 - version - gdi32 - comdlg32 - ) - - +project(ttproxy) + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4") +endif() + +include(${CMAKE_CURRENT_SOURCE_DIR}/../libs/lib_openssl.cmake) + +set(COMMON_SRC + ../teraterm/common/ttlib.h + ../teraterm/common/i18n.h + ../teraterm/common/ttplugin.h + ../teraterm/common/tttypes.h + ../teraterm/common/tt-version.h + ../teraterm/common/codeconv.h + ../teraterm/common/codeconv.cpp + ../teraterm/common/dlglib.h + ../teraterm/common/dlglib.c + ../teraterm/common/dlglib_cpp.cpp + ../teraterm/common/dlglib_tmpl.cpp + ../teraterm/teraterm/ttdialog.h + ../teraterm/teraterm/ttfileio.h + ../teraterm/teraterm/ttsetup.h + ../teraterm/teraterm/ttwsk.h + ) +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(YCL_SRC + YCL/include/YCL/Array.h + YCL/include/YCL/ComboBoxCtrl.h + YCL/include/YCL/common.h + YCL/include/YCL/Dialog.h + YCL/include/YCL/DynamicLinkLibrary.h + YCL/include/YCL/EditBoxCtrl.h + YCL/include/YCL/Enumeration.h + YCL/include/YCL/FileVersion.h + YCL/include/YCL/HASHCODE.h + YCL/include/YCL/Hashtable.h + YCL/include/YCL/IniFile.h + YCL/include/YCL/Integer.h + YCL/include/YCL/Object.h + YCL/include/YCL/Pointer.h + YCL/include/YCL/Resource.h + YCL/include/YCL/String.h + YCL/include/YCL/StringBuffer.h + YCL/include/YCL/StringUtil.h + YCL/include/YCL/ValueCtrl.h + YCL/include/YCL/Vector.h + YCL/include/YCL/Window.h + ) +source_group( + "YCL" + FILES + ${YCL_SRC} + ) + +set(SRC + Hooker.h + Logger.h + ProxyWSockHook.h + resource.h + SSLLIB.h + SSLSocket.h + StdAfx.cpp + StdAfx.h + TTProxy.cpp + TTProxy.h + TTProxy.rc + ) + +include_directories( + ../teraterm/teraterm + ../teraterm/common + YCL/include + ${OPENSSL_INCLUDE_DIRS} + . + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-uTTXBind @ 8") + +add_library( + ttproxy SHARED + ${SRC} + ${COMMON_SRC} + ${YCL_SRC} + ) + +set_target_properties( + ttproxy + PROPERTIES + PREFIX "" + OUTPUT_NAME "TTXProxy" + ) + +target_link_libraries( + ttproxy + ttpcmn + # + ws2_32 + version + gdi32 + comdlg32 + ) + + Modified: branches/cmake/TTXKanjiMenu/CMakeLists.txt =================================================================== --- branches/cmake/TTXKanjiMenu/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXKanjiMenu/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,46 +1,46 @@ -project(ttxkanjimenu) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(SRC - resource.h - ttxkanjimenu.c - ttxkanjimenu.rc - ) - -include_directories( - ../teraterm/teraterm - ../teraterm/common - ../libs/openssl/inc32 - . - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - ttxkanjimenu SHARED - ${SRC} - ) - -set_target_properties( - ttxkanjimenu - PROPERTIES - PREFIX "" - ) - -target_link_libraries( - ttxkanjimenu - ttpcmn - # - ws2_32 - ) - - +project(ttxkanjimenu) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(SRC + resource.h + ttxkanjimenu.c + ttxkanjimenu.rc + ) + +include_directories( + ../teraterm/teraterm + ../teraterm/common + ../libs/openssl/inc32 + . + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + ttxkanjimenu SHARED + ${SRC} + ) + +set_target_properties( + ttxkanjimenu + PROPERTIES + PREFIX "" + ) + +target_link_libraries( + ttxkanjimenu + ttpcmn + # + ws2_32 + ) + + Modified: branches/cmake/TTXSamples/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,48 +1,48 @@ - -add_subdirectory(TTXAdditionalTitle) -set_target_properties(TTXAdditionalTitle PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXAlwaysOnTop) -set_target_properties(TTXAlwaysOnTop PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXCallSysMenu) -set_target_properties(TTXCallSysMenu PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXCommandLineOpt) -set_target_properties(TTXCommandLineOpt PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXCopyIniFile) -set_target_properties(TTXCopyIniFile PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXFixedWinSize) -set_target_properties(TTXFixedWinSize PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXKcodeChange) -set_target_properties(TTXKcodeChange PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXOutputBuffering) -set_target_properties(TTXOutputBuffering PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXRecurringCommand) -set_target_properties(TTXRecurringCommand PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXResizeMenu) -set_target_properties(TTXResizeMenu PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXResizeWin) -set_target_properties(TTXResizeWin PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXShowCommandLine) -set_target_properties(TTXShowCommandLine PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXtest) -set_target_properties(TTXtest PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXttyrec) -set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples) -set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples) - -add_subdirectory(TTXViewMode) -set_target_properties(TTXViewMode PROPERTIES FOLDER TTXSamples) - - + +add_subdirectory(TTXAdditionalTitle) +set_target_properties(TTXAdditionalTitle PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXAlwaysOnTop) +set_target_properties(TTXAlwaysOnTop PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXCallSysMenu) +set_target_properties(TTXCallSysMenu PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXCommandLineOpt) +set_target_properties(TTXCommandLineOpt PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXCopyIniFile) +set_target_properties(TTXCopyIniFile PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXFixedWinSize) +set_target_properties(TTXFixedWinSize PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXKcodeChange) +set_target_properties(TTXKcodeChange PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXOutputBuffering) +set_target_properties(TTXOutputBuffering PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXRecurringCommand) +set_target_properties(TTXRecurringCommand PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXResizeMenu) +set_target_properties(TTXResizeMenu PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXResizeWin) +set_target_properties(TTXResizeWin PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXShowCommandLine) +set_target_properties(TTXShowCommandLine PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXtest) +set_target_properties(TTXtest PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXttyrec) +set_target_properties(TTXttyrec PROPERTIES FOLDER TTXSamples) +set_target_properties(TTXttyplay PROPERTIES FOLDER TTXSamples) + +add_subdirectory(TTXViewMode) +set_target_properties(TTXViewMode PROPERTIES FOLDER TTXSamples) + + Modified: branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,37 +1,37 @@ -project(TTXAdditionalTitle) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXAdditionalTitle.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - TTXAdditionalTitle SHARED - ${SRC} - ) - -set_target_properties( - TTXAdditionalTitle - PROPERTIES - PREFIX "" - ) - -target_link_libraries( - TTXAdditionalTitle - ttpcmn - ) - +project(TTXAdditionalTitle) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXAdditionalTitle.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + TTXAdditionalTitle SHARED + ${SRC} + ) + +set_target_properties( + TTXAdditionalTitle + PROPERTIES + PREFIX "" + ) + +target_link_libraries( + TTXAdditionalTitle + ttpcmn + ) + Modified: branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,42 +1,42 @@ -project(TTXAlwaysOnTop) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(SRC - TTXAlwaysOnTop.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - TTXAlwaysOnTop SHARED - ${SRC} - ) - -set_target_properties( - TTXAlwaysOnTop - PROPERTIES - PREFIX "" - ) - -target_link_libraries( - TTXAlwaysOnTop - ttpcmn - ) - - +project(TTXAlwaysOnTop) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(SRC + TTXAlwaysOnTop.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + TTXAlwaysOnTop SHARED + ${SRC} + ) + +set_target_properties( + TTXAlwaysOnTop + PROPERTIES + PREFIX "" + ) + +target_link_libraries( + TTXAlwaysOnTop + ttpcmn + ) + + Modified: branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXCallSysMenu/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXCallSysMenu) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXCallSysMenu.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXCallSysMenu SHARED - ${SRC} - ) - -set_target_properties( - TTXCallSysMenu - PROPERTIES - PREFIX "" - ) +project(TTXCallSysMenu) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXCallSysMenu.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXCallSysMenu SHARED + ${SRC} + ) + +set_target_properties( + TTXCallSysMenu + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,39 +1,39 @@ -project(TTXCommandLineOpt) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXCommandLineOpt.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - TTXCommandLineOpt SHARED - ${SRC} - ) - -set_target_properties( - TTXCommandLineOpt - PROPERTIES - PREFIX "" - SUFFIX ".dll" - ) - -target_link_libraries( - TTXCommandLineOpt - ttpcmn - ) - - +project(TTXCommandLineOpt) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXCommandLineOpt.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + TTXCommandLineOpt SHARED + ${SRC} + ) + +set_target_properties( + TTXCommandLineOpt + PROPERTIES + PREFIX "" + SUFFIX ".dll" + ) + +target_link_libraries( + TTXCommandLineOpt + ttpcmn + ) + + Modified: branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXCopyIniFile/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXCopyIniFile) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXCopyIniFile.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXCopyIniFile SHARED - ${SRC} - ) - -set_target_properties( - TTXCopyIniFile - PROPERTIES - PREFIX "" - ) +project(TTXCopyIniFile) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXCopyIniFile.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXCopyIniFile SHARED + ${SRC} + ) + +set_target_properties( + TTXCopyIniFile + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXFixedWinSize/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXFixedWinSize) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXFixedWinSize.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXFixedWinSize SHARED - ${SRC} - ) - -set_target_properties( - TTXFixedWinSize - PROPERTIES - PREFIX "" - ) +project(TTXFixedWinSize) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXFixedWinSize.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXFixedWinSize SHARED + ${SRC} + ) + +set_target_properties( + TTXFixedWinSize + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXKcodeChange/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXKcodeChange) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXKcodeChange.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXKcodeChange SHARED - ${SRC} - ) - -set_target_properties( - TTXKcodeChange - PROPERTIES - PREFIX "" - ) +project(TTXKcodeChange) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXKcodeChange.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXKcodeChange SHARED + ${SRC} + ) + +set_target_properties( + TTXKcodeChange + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXOutputBuffering/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXOutputBuffering) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXOutputBuffering.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXOutputBuffering SHARED - ${SRC} - ) - -set_target_properties( - TTXOutputBuffering - PROPERTIES - PREFIX "" - ) +project(TTXOutputBuffering) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXOutputBuffering.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXOutputBuffering SHARED + ${SRC} + ) + +set_target_properties( + TTXOutputBuffering + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,57 +1,57 @@ -project(TTXRecurringCommand) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(COMMON_SRC - ../../teraterm/common/dlglib.h - ../../teraterm/common/dlglib.c - ../../teraterm/common/dlglib_cpp.cpp - ../../teraterm/common/dlglib_tmpl.cpp - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - TTXRecurringCommand.c - TTXRecurringCommand.rc - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - TTXRecurringCommand SHARED - ${SRC} - ${COMMON_SRC} - ) - -set_target_properties( - TTXRecurringCommand - PROPERTIES - PREFIX "" - ) - -target_link_libraries( - TTXRecurringCommand - ttpcmn - # - gdi32 - ) +project(TTXRecurringCommand) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(COMMON_SRC + ../../teraterm/common/dlglib.h + ../../teraterm/common/dlglib.c + ../../teraterm/common/dlglib_cpp.cpp + ../../teraterm/common/dlglib_tmpl.cpp + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + TTXRecurringCommand.c + TTXRecurringCommand.rc + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + TTXRecurringCommand SHARED + ${SRC} + ${COMMON_SRC} + ) + +set_target_properties( + TTXRecurringCommand + PROPERTIES + PREFIX "" + ) + +target_link_libraries( + TTXRecurringCommand + ttpcmn + # + gdi32 + ) Modified: branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,38 +1,38 @@ -project(TTXResizeMenu) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXResizeMenu.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - TTXResizeMenu SHARED - ${SRC} - ) - -set_target_properties( - TTXResizeMenu - PROPERTIES - PREFIX "" - ) - -target_link_libraries( - TTXResizeMenu - ttpcmn - ) - - +project(TTXResizeMenu) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXResizeMenu.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + TTXResizeMenu SHARED + ${SRC} + ) + +set_target_properties( + TTXResizeMenu + PROPERTIES + PREFIX "" + ) + +target_link_libraries( + TTXResizeMenu + ttpcmn + ) + + Modified: branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXResizeWin/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXResizeWin) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXResizeWin.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXResizeWin SHARED - ${SRC} - ) - -set_target_properties( - TTXResizeWin - PROPERTIES - PREFIX "" - ) +project(TTXResizeWin) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXResizeWin.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXResizeWin SHARED + ${SRC} + ) + +set_target_properties( + TTXResizeWin + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXShowCommandLine/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,25 +1,25 @@ -project(TTXShowCommandLine) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - TTXShowCommandLine.c - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXShowCommandLine SHARED - ${SRC} - ) - -set_target_properties( - TTXShowCommandLine - PROPERTIES - PREFIX "" - ) +project(TTXShowCommandLine) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + TTXShowCommandLine.c + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXShowCommandLine SHARED + ${SRC} + ) + +set_target_properties( + TTXShowCommandLine + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXViewMode/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,28 +1,28 @@ -project(TTXViewMode) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - resource.h - TTXViewMode.c - TTXViewMode.h - TTXViewMode.rc - ReadMe.txt - ReadMe-ja.txt - ) - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXViewMode SHARED - ${SRC} - ) - -set_target_properties( - TTXViewMode - PROPERTIES - PREFIX "" - ) +project(TTXViewMode) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + resource.h + TTXViewMode.c + TTXViewMode.h + TTXViewMode.rc + ReadMe.txt + ReadMe-ja.txt + ) + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXViewMode SHARED + ${SRC} + ) + +set_target_properties( + TTXViewMode + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,51 +1,51 @@ -project(TTXttyrec) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -if(MINGW) - link_directories( - ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp - ) -endif() - -add_library( - TTXttyplay SHARED - TTXttyplay.c - gettimeofday.c - gettimeofday.h - ReadMe.txt - ReadMe-ja.txt - ) - -target_link_libraries( - TTXttyplay - ttpcmn - # - comdlg32 - ) - -add_library( - TTXttyrec SHARED - TTXttyrec.c - gettimeofday.c - gettimeofday.h - ReadMe.txt - ReadMe-ja.txt - ) - -target_link_libraries( - TTXttyrec - ttpcmn - comdlg32 - ) - -set_target_properties( - TTXttyrec TTXttyplay - PROPERTIES - PREFIX "" - ) +project(TTXttyrec) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +if(MINGW) + link_directories( + ${CMAKE_SOURCE_DIR}/teraterm/htmlhelp + ) +endif() + +add_library( + TTXttyplay SHARED + TTXttyplay.c + gettimeofday.c + gettimeofday.h + ReadMe.txt + ReadMe-ja.txt + ) + +target_link_libraries( + TTXttyplay + ttpcmn + # + comdlg32 + ) + +add_library( + TTXttyrec SHARED + TTXttyrec.c + gettimeofday.c + gettimeofday.h + ReadMe.txt + ReadMe-ja.txt + ) + +target_link_libraries( + TTXttyrec + ttpcmn + comdlg32 + ) + +set_target_properties( + TTXttyrec TTXttyplay + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/TTXSamples/ttxtest/CMakeLists.txt =================================================================== --- branches/cmake/TTXSamples/ttxtest/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/TTXSamples/ttxtest/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,19 +1,19 @@ -project(TTXtest) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -include_directories( - ../../teraterm/teraterm - ../../teraterm/common - ) - -add_library( - TTXtest SHARED - TTXtest.c - ) - -set_target_properties( - TTXtest - PROPERTIES - PREFIX "" - ) +project(TTXtest) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +include_directories( + ../../teraterm/teraterm + ../../teraterm/common + ) + +add_library( + TTXtest SHARED + TTXtest.c + ) + +set_target_properties( + TTXtest + PROPERTIES + PREFIX "" + ) Modified: branches/cmake/libs/putty.cmake =================================================================== --- branches/cmake/libs/putty.cmake 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/libs/putty.cmake 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,33 +1,33 @@ -# cmake -P putty.cmake - -set(SRC_DIR_BASE "putty-0.70") -set(SRC_ARC "putty-0.70.tar.gz") -set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.70/putty-0.70.tar.gz") -set(SRC_ARC_HASH_SHA256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be) - -set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/putty") -set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/putty/src") -set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/putty/src/${SRC_DIR_BASE}") -set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/putty") - -if(NOT EXISTS ${INSTALL_DIR}/README) - - file(DOWNLOAD - ${SRC_URL} - ${DOWN_DIR}/${SRC_ARC} - EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256} - SHOW_PROGRESS - ) - - file(MAKE_DIRECTORY ${EXTRACT_DIR}) - - execute_process( - COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC} - WORKING_DIRECTORY ${EXTRACT_DIR} - ) - - file(REMOVE_RECURSE ${INSTALL_DIR}) - file(RENAME ${SRC_DIR} ${INSTALL_DIR}) - file(REMOVE_RECURSE ${EXTRACT_DIR}) - -endif() +# cmake -P putty.cmake + +set(SRC_DIR_BASE "putty-0.70") +set(SRC_ARC "putty-0.70.tar.gz") +set(SRC_URL "https://the.earth.li/~sgtatham/putty/0.70/putty-0.70.tar.gz") +set(SRC_ARC_HASH_SHA256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be) + +set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/putty") +set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/putty/src") +set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/putty/src/${SRC_DIR_BASE}") +set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/putty") + +if(NOT EXISTS ${INSTALL_DIR}/README) + + file(DOWNLOAD + ${SRC_URL} + ${DOWN_DIR}/${SRC_ARC} + EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256} + SHOW_PROGRESS + ) + + file(MAKE_DIRECTORY ${EXTRACT_DIR}) + + execute_process( + COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC} + WORKING_DIRECTORY ${EXTRACT_DIR} + ) + + file(REMOVE_RECURSE ${INSTALL_DIR}) + file(RENAME ${SRC_DIR} ${INSTALL_DIR}) + file(REMOVE_RECURSE ${EXTRACT_DIR}) + +endif() Modified: branches/cmake/teraterm/keycode/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/keycode/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/keycode/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,42 +1,42 @@ -project(keycode) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - keycode.c - keycode.ico - keycode-version.rc - keycode.rc - kc_res.h - ) - -include_directories( - ../common - ../ttpfile - . - ) - -add_executable( - keycode WIN32 - ${SRC} - ) - -target_link_libraries( - keycode - gdi32 - ) +project(keycode) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + keycode.c + keycode.ico + keycode-version.rc + keycode.rc + kc_res.h + ) + +include_directories( + ../common + ../ttpfile + . + ) + +add_executable( + keycode WIN32 + ${SRC} + ) + +target_link_libraries( + keycode + gdi32 + ) Modified: branches/cmake/teraterm/svnrev/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/svnrev/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/svnrev/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,23 +1,23 @@ -project(svnrev) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - svnrev.cpp - svnrev.h - ) - -include_directories( - ../common - ../ttpfile - . - ) - -add_executable( - svnrev - ${SRC} - ) - -target_link_libraries( - svnrev - ) +project(svnrev) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + svnrev.cpp + svnrev.h + ) + +include_directories( + ../common + ../ttpfile + . + ) + +add_executable( + svnrev + ${SRC} + ) + +target_link_libraries( + svnrev + ) Modified: branches/cmake/teraterm/ttpcmn/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/ttpcmn/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/ttpcmn/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,88 +1,88 @@ -project(ttpcmn) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(COMMON_SRC - ../common/teraterm.h - ../common/tttypes.h - ../common/i18n.c - ../common/i18n.h - ../common/ttlib.c - ../common/ttlib.h - ../common/servicenames.c - ../common/servicenames.h - ../common/tt-version.h - ../common/ttftypes.h - ../common/ttcommon.h - ../common/tt_res.h - ../common/codeconv.h - ../common/codeconv.cpp - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - cmn_res.h - language.c - language.h - ttcmn.c - ttcmn_notify.c - ttpcmn-version.rc - ${COMMON_SRC} - ) - -include_directories( - ../common - ../ttpfile - . - ) - -if(MINGW) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp - ) -endif() - -add_library( - ttpcmn - SHARED - ${SRC} - ) - -target_compile_definitions( - ttpcmn - PRIVATE -DTTPCMN_DLL - ) -if(MINGW) - set_target_properties( - ttpcmn - PROPERTIES PREFIX "" - SUFFIX ".dll" - ) -endif() - -target_link_libraries( - ttpcmn - ole32 - setupapi - htmlhelp - ) +project(ttpcmn) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(COMMON_SRC + ../common/teraterm.h + ../common/tttypes.h + ../common/i18n.c + ../common/i18n.h + ../common/ttlib.c + ../common/ttlib.h + ../common/servicenames.c + ../common/servicenames.h + ../common/tt-version.h + ../common/ttftypes.h + ../common/ttcommon.h + ../common/tt_res.h + ../common/codeconv.h + ../common/codeconv.cpp + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + cmn_res.h + language.c + language.h + ttcmn.c + ttcmn_notify.c + ttpcmn-version.rc + ${COMMON_SRC} + ) + +include_directories( + ../common + ../ttpfile + . + ) + +if(MINGW) + link_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp + ) +endif() + +add_library( + ttpcmn + SHARED + ${SRC} + ) + +target_compile_definitions( + ttpcmn + PRIVATE -DTTPCMN_DLL + ) +if(MINGW) + set_target_properties( + ttpcmn + PROPERTIES PREFIX "" + SUFFIX ".dll" + ) +endif() + +target_link_libraries( + ttpcmn + ole32 + setupapi + htmlhelp + ) Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,101 +1,101 @@ -project(ttpdlg) - -include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -if(MINGW) - set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/../common") -else() - set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /i ${CMAKE_CURRENT_SOURCE_DIR}/../common") -endif() - -set(COMMON_SRC - ../common/dlglib.c - ../common/dlglib.h - ../common/dlglib_cpp.cpp - ../common/dlglib_tmpl.cpp - ../common/ttlib.c - ../common/ttlib.h - ../common/teraterm.ico - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - dlg_res.h - ttdlg.c - ttpdlg.rc - ttpdlg-version.rc - ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h - ${COMMON_SRC} - ) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../common - ${CMAKE_CURRENT_BINARY_DIR} - ${ONIGURUMA_INCLUDE_DIRS} - ) - -if(MINGW) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp - ${ONIGURUMA_LIBRARY_DIRS} - ) -else() - link_directories( - ${ONIGURUMA_LIBRARY_DIRS} - ) -endif() - -add_library( - ttpdlg SHARED - ${SRC} - ) - -if(MINGW) - set_target_properties( - ttpdlg - PROPERTIES PREFIX "" - SUFFIX ".dll" - ) -endif() - -target_link_libraries( - ttpdlg - ttpcmn - optimized onig.lib - debug onigd.lib - ) - -add_dependencies( - ttpdlg - ttpcmn - ) - -## svnversion.h -if(EXISTS ${CMAKE_SOURCE_DIR}/.svn) - INCLUDE(FindSubversion) -endif() -if(Subversion_FOUND) - Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n") - message("rev.${TT_WC_REVISION}") -else() - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#undef SVNVERSION\n") -endif() +project(ttpdlg) + +include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +if(MINGW) + set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/../common") +else() + set(CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} /i ${CMAKE_CURRENT_SOURCE_DIR}/../common") +endif() + +set(COMMON_SRC + ../common/dlglib.c + ../common/dlglib.h + ../common/dlglib_cpp.cpp + ../common/dlglib_tmpl.cpp + ../common/ttlib.c + ../common/ttlib.h + ../common/teraterm.ico + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + dlg_res.h + ttdlg.c + ttpdlg.rc + ttpdlg-version.rc + ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h + ${COMMON_SRC} + ) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../common + ${CMAKE_CURRENT_BINARY_DIR} + ${ONIGURUMA_INCLUDE_DIRS} + ) + +if(MINGW) + link_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp + ${ONIGURUMA_LIBRARY_DIRS} + ) +else() + link_directories( + ${ONIGURUMA_LIBRARY_DIRS} + ) +endif() + +add_library( + ttpdlg SHARED + ${SRC} + ) + +if(MINGW) + set_target_properties( + ttpdlg + PROPERTIES PREFIX "" + SUFFIX ".dll" + ) +endif() + +target_link_libraries( + ttpdlg + ttpcmn + optimized onig.lib + debug onigd.lib + ) + +add_dependencies( + ttpdlg + ttpcmn + ) + +## svnversion.h +if(EXISTS ${CMAKE_SOURCE_DIR}/.svn) + INCLUDE(FindSubversion) +endif() +if(Subversion_FOUND) + Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT) + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#define SVNVERSION ${TT_WC_REVISION}\n") + message("rev.${TT_WC_REVISION}") +else() + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h "#undef SVNVERSION\n") +endif() Modified: branches/cmake/teraterm/ttpfile/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/ttpfile/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/ttpfile/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,89 +1,89 @@ -project(ttpfile) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(COMMON_SRC - ../common/dlglib.c - ../common/dlglib.h - ../common/dlglib_cpp.cpp - ../common/dlglib_tmpl.cpp - ../common/ttlib.c - ../common/ttlib.h - ../common/win16api.h - ../common/win16api.c - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - bplus.c - bplus.h - ftlib.c - ftlib.h - kermit.c - kermit.h - quickvan.c - quickvan.h - ttfile.c - xmodem.c - xmodem.h - ymodem.c - ymodem.h - zmodem.c - zmodem.h - file_res.h - ttpfile-version.rc - ttpfile.rc - ${COMMON_SRC} - ) - -include_directories( - ../common - ) - -if(MINGW) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp - ) -endif() - -add_library( - ttpfile SHARED - ${SRC} - ) - -if(MINGW) - set_target_properties( - ttpfile - PROPERTIES PREFIX "" - SUFFIX ".dll" - ) -endif() - -target_link_libraries( - ttpfile - ttpcmn - # - gdi32 - comdlg32 - ) - -add_dependencies( - ttpfile - ttpcmn - ) +project(ttpfile) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(COMMON_SRC + ../common/dlglib.c + ../common/dlglib.h + ../common/dlglib_cpp.cpp + ../common/dlglib_tmpl.cpp + ../common/ttlib.c + ../common/ttlib.h + ../common/win16api.h + ../common/win16api.c + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + bplus.c + bplus.h + ftlib.c + ftlib.h + kermit.c + kermit.h + quickvan.c + quickvan.h + ttfile.c + xmodem.c + xmodem.h + ymodem.c + ymodem.h + zmodem.c + zmodem.h + file_res.h + ttpfile-version.rc + ttpfile.rc + ${COMMON_SRC} + ) + +include_directories( + ../common + ) + +if(MINGW) + link_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp + ) +endif() + +add_library( + ttpfile SHARED + ${SRC} + ) + +if(MINGW) + set_target_properties( + ttpfile + PROPERTIES PREFIX "" + SUFFIX ".dll" + ) +endif() + +target_link_libraries( + ttpfile + ttpcmn + # + gdi32 + comdlg32 + ) + +add_dependencies( + ttpfile + ttpcmn + ) Modified: branches/cmake/teraterm/ttpmacro/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/ttpmacro/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,139 +1,139 @@ -project(ttpmacro) - -include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -if(USE_UNICODE_API) - add_definitions(-DUNICODE -D_UNICODE) -endif() - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(COMMON_SRC - ../common/i18n.c - ../common/i18n.h - ../common/ttlib.c - ../common/ttlib.h - ../common/tmfc.cpp - ../common/tmfc.h - ../common/tmfc_frame.cpp - ../common/dlglib.h - ../common/dlglib.c - ../common/dlglib_tmpl.cpp - ../common/dlglib_cpp.cpp - ../common/compat_w95.h - ../common/compat_win.h - ../common/compat_win.cpp - ../common/win16api.h - ../common/win16api.c - ../common/codeconv.h - ../common/codeconv.cpp - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - ttm_res.h - errdlg.cpp - errdlg.h - inpdlg.cpp - inpdlg.h - ListDlg.cpp - ListDlg.h - msgdlg.cpp - msgdlg.h - statdlg.cpp - statdlg.h - ttl.cpp - ttl.h - ttl_gui.cpp - ttm_res.h - ttmacro.cpp - ttmacro.h - ttmbuff.c - ttmbuff.h - ttmdde.c - ttmdde.h - ttmdef.h - ttmdlg.cpp - ttmdlg.h - ttmenc.c - ttmenc.h - ttmlib.c - ttmlib.h - ttmmain.cpp - ttmmain.h - ttmmsg.h - ttmonig.h - ttmparse.c - ttmparse.h - wait4all.c - wait4all.h - ttpmacro.rc - ttm-version.rc - fileread.h - fileread.cpp - ${COMMON_SRC} - ) - -include_directories( - ${ONIGURUMA_INCLUDE_DIRS} - ${SFMT_INCLUDE_DIRS} - ${CMAKE_CURRENT_SOURCE_DIR}/../common - ) - -link_directories( - ${ONIGURUMA_LIBRARY_DIRS} - ${SFMT_LIBRARY_DIRS} - ) - -if (MSVC) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll") -endif() - -if(MINGW) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp - ) -endif() - -add_executable( - ttpmacro WIN32 - ${SRC} - ) - -target_link_libraries( - ttpmacro - ttpcmn - optimized onig - debug onigd - optimized sfmt - debug sfmtd - # - iphlpapi - delayimp - ws2_32 - comctl32 - gdi32 - comdlg32 - ) - -add_dependencies( - ttpmacro - ttpcmn - ) +project(ttpmacro) + +include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +if(USE_UNICODE_API) + add_definitions(-DUNICODE -D_UNICODE) +endif() + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(COMMON_SRC + ../common/i18n.c + ../common/i18n.h + ../common/ttlib.c + ../common/ttlib.h + ../common/tmfc.cpp + ../common/tmfc.h + ../common/tmfc_frame.cpp + ../common/dlglib.h + ../common/dlglib.c + ../common/dlglib_tmpl.cpp + ../common/dlglib_cpp.cpp + ../common/compat_w95.h + ../common/compat_win.h + ../common/compat_win.cpp + ../common/win16api.h + ../common/win16api.c + ../common/codeconv.h + ../common/codeconv.cpp + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + ttm_res.h + errdlg.cpp + errdlg.h + inpdlg.cpp + inpdlg.h + ListDlg.cpp + ListDlg.h + msgdlg.cpp + msgdlg.h + statdlg.cpp + statdlg.h + ttl.cpp + ttl.h + ttl_gui.cpp + ttm_res.h + ttmacro.cpp + ttmacro.h + ttmbuff.c + ttmbuff.h + ttmdde.c + ttmdde.h + ttmdef.h + ttmdlg.cpp + ttmdlg.h + ttmenc.c + ttmenc.h + ttmlib.c + ttmlib.h + ttmmain.cpp + ttmmain.h + ttmmsg.h + ttmonig.h + ttmparse.c + ttmparse.h + wait4all.c + wait4all.h + ttpmacro.rc + ttm-version.rc + fileread.h + fileread.cpp + ${COMMON_SRC} + ) + +include_directories( + ${ONIGURUMA_INCLUDE_DIRS} + ${SFMT_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR}/../common + ) + +link_directories( + ${ONIGURUMA_LIBRARY_DIRS} + ${SFMT_LIBRARY_DIRS} + ) + +if (MSVC) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:iphlpapi.dll /DELAYLOAD:user32.dll") +endif() + +if(MINGW) + link_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp + ) +endif() + +add_executable( + ttpmacro WIN32 + ${SRC} + ) + +target_link_libraries( + ttpmacro + ttpcmn + optimized onig + debug onigd + optimized sfmt + debug sfmtd + # + iphlpapi + delayimp + ws2_32 + comctl32 + gdi32 + comdlg32 + ) + +add_dependencies( + ttpmacro + ttpcmn + ) Modified: branches/cmake/teraterm/ttpset/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/ttpset/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/ttpset/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,68 +1,68 @@ -project(ttpset) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(COMMON_SRC - ../common/tttypes.h - ../common/ttlib.c - ../common/ttlib.h - ../common/servicenames.h - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - ttset.c - ttpset-version.rc - ${COMMON_SRC} - ) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../common - ) - -if(MINGW) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp - ) -endif() - -add_library( - ttpset SHARED - ${SRC} - ) - -if(MINGW) - set_target_properties( - ttpset - PROPERTIES PREFIX "" - SUFFIX ".dll" - ) -endif() - -target_link_libraries( - ttpset - ttpcmn - # - gdi32 - ) - -add_dependencies( - ttpset - ttpcmn - ) +project(ttpset) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(COMMON_SRC + ../common/tttypes.h + ../common/ttlib.c + ../common/ttlib.h + ../common/servicenames.h + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + ttset.c + ttpset-version.rc + ${COMMON_SRC} + ) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../common + ) + +if(MINGW) + link_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp + ) +endif() + +add_library( + ttpset SHARED + ${SRC} + ) + +if(MINGW) + set_target_properties( + ttpset + PROPERTIES PREFIX "" + SUFFIX ".dll" + ) +endif() + +target_link_libraries( + ttpset + ttpcmn + # + gdi32 + ) + +add_dependencies( + ttpset + ttpcmn + ) Modified: branches/cmake/teraterm/ttptek/CMakeLists.txt =================================================================== --- branches/cmake/teraterm/ttptek/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/teraterm/ttptek/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,87 +1,87 @@ -project(ttptek) - -include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake) -include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake) - -if (MSVC) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) -endif () - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(COMMON_SRC - ../common/tttypes.h - ../common/i18n.c - ../common/i18n.h - ../common/ttlib.c - ../common/ttlib.h - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - tek_res.h - tekesc.c - tekesc.h -# ttptek.rc - ttptek-version.rc - tttek.h - tttek.c - ${COMMON_SRC} - ) - -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../common - ${ONIGURUMA_INCLUDE} - ${SFMT_INCLUDE_DIR} - ) - -link_directories( - ${SFMT_LIBRARY_DIRS} - ) - -if(MINGW) - link_directories( - ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp - ) -endif() - -add_library( - ttptek SHARED - ${SRC} - ) - -if(MINGW) - set_target_properties( - ttptek - PROPERTIES PREFIX "" - SUFFIX ".dll" - ) -endif() - -target_link_libraries( - ttptek - ttpcmn - debug sfmtd - optimized sfmt - # - iphlpapi - htmlhelp - gdi32 - ) - -add_dependencies( - ttptek - ttpcmn - ) +project(ttptek) + +include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake) + +if (MSVC) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) + string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}) +endif () + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(COMMON_SRC + ../common/tttypes.h + ../common/i18n.c + ../common/i18n.h + ../common/ttlib.c + ../common/ttlib.h + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + tek_res.h + tekesc.c + tekesc.h +# ttptek.rc + ttptek-version.rc + tttek.h + tttek.c + ${COMMON_SRC} + ) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../common + ${ONIGURUMA_INCLUDE} + ${SFMT_INCLUDE_DIR} + ) + +link_directories( + ${SFMT_LIBRARY_DIRS} + ) + +if(MINGW) + link_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp + ) +endif() + +add_library( + ttptek SHARED + ${SRC} + ) + +if(MINGW) + set_target_properties( + ttptek + PROPERTIES PREFIX "" + SUFFIX ".dll" + ) +endif() + +target_link_libraries( + ttptek + ttpcmn + debug sfmtd + optimized sfmt + # + iphlpapi + htmlhelp + gdi32 + ) + +add_dependencies( + ttptek + ttpcmn + ) Modified: branches/cmake/ttpmenu/CMakeLists.txt =================================================================== --- branches/cmake/ttpmenu/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttpmenu/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,53 +1,53 @@ -project(ttpmenu) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(COMMON_SRC - ../teraterm/common/ttlib.c - ../teraterm/common/i18n.c - # TODO ↑ in dll - ../teraterm/common/ttlib.h - ../teraterm/common/i18n.h - ) - -source_group( - "common" - FILES - ${COMMON_SRC} - ) - -set(SRC - resource.h - registry.cpp - winmisc.cpp - ttpmenu.h - ttpmenu.cpp - # - ttpmenu.rc - left.ico - right.ico - teraterm.ico - ) - - -include_directories( - ../teraterm/common - . - ) - -add_executable( - ttpmenu WIN32 - ${SRC} - ${COMMON_SRC} - ) - -target_link_libraries( - ttpmenu - version - comctl32 - user32 - gdi32 - comdlg32 - ) - - +project(ttpmenu) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(COMMON_SRC + ../teraterm/common/ttlib.c + ../teraterm/common/i18n.c + # TODO ↑ in dll + ../teraterm/common/ttlib.h + ../teraterm/common/i18n.h + ) + +source_group( + "common" + FILES + ${COMMON_SRC} + ) + +set(SRC + resource.h + registry.cpp + winmisc.cpp + ttpmenu.h + ttpmenu.cpp + # + ttpmenu.rc + left.ico + right.ico + teraterm.ico + ) + + +include_directories( + ../teraterm/common + . + ) + +add_executable( + ttpmenu WIN32 + ${SRC} + ${COMMON_SRC} + ) + +target_link_libraries( + ttpmenu + version + comctl32 + user32 + gdi32 + comdlg32 + ) + + Modified: branches/cmake/ttssh2/CMakeLists.txt =================================================================== --- branches/cmake/ttssh2/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttssh2/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,16 +1,16 @@ -add_subdirectory(ttxssh) -set_target_properties(ttxssh PROPERTIES FOLDER ttssh2) - -add_subdirectory(ttssh) -set_target_properties(ttssh PROPERTIES FOLDER ttssh2) - -add_subdirectory(matcher) -set_target_properties(matcher PROPERTIES FOLDER ttssh2) - -# config時に cmake で puttyversion.h を生成するようにした -#add_subdirectory(puttyrev) -#set_target_properties(puttyrev PROPERTIES FOLDER ttssh2) - -add_subdirectory(putty) -set_target_properties(libputty PROPERTIES FOLDER ttssh2) - +add_subdirectory(ttxssh) +set_target_properties(ttxssh PROPERTIES FOLDER ttssh2) + +add_subdirectory(ttssh) +set_target_properties(ttssh PROPERTIES FOLDER ttssh2) + +add_subdirectory(matcher) +set_target_properties(matcher PROPERTIES FOLDER ttssh2) + +# config時に cmake で puttyversion.h を生成するようにした +#add_subdirectory(puttyrev) +#set_target_properties(puttyrev PROPERTIES FOLDER ttssh2) + +add_subdirectory(putty) +set_target_properties(libputty PROPERTIES FOLDER ttssh2) + Modified: branches/cmake/ttssh2/matcher/CMakeLists.txt =================================================================== --- branches/cmake/ttssh2/matcher/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttssh2/matcher/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,13 +1,13 @@ -project(matcher) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - matcher.c - test.c - ) - -add_executable( - matcher - ${SRC} - ) +project(matcher) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + matcher.c + test.c + ) + +add_executable( + matcher + ${SRC} + ) Modified: branches/cmake/ttssh2/putty/CMakeLists.txt =================================================================== --- branches/cmake/ttssh2/putty/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttssh2/putty/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,30 +1,30 @@ -project(libputty) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -if(MINGW) - add_definitions("-D_WINDOWS") -endif() - -set(SRC - ../../libs/putty/conf.c - ../../libs/putty/misc.c - ../../libs/putty/tree234.c - ../../libs/putty/version.c - ../../libs/putty/windows/winmisc.c - ../../libs/putty/windows/winpgntc.c - ../../libs/putty/windows/winsecur.c - libputty.c - libputty.h - ) - -include_directories( - ../../libs/putty - ../../libs/putty/windows - . - ) - -add_library( - libputty - ${SRC} - ) +project(libputty) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +if(MINGW) + add_definitions("-D_WINDOWS") +endif() + +set(SRC + ../../libs/putty/conf.c + ../../libs/putty/misc.c + ../../libs/putty/tree234.c + ../../libs/putty/version.c + ../../libs/putty/windows/winmisc.c + ../../libs/putty/windows/winpgntc.c + ../../libs/putty/windows/winsecur.c + libputty.c + libputty.h + ) + +include_directories( + ../../libs/putty + ../../libs/putty/windows + . + ) + +add_library( + libputty + ${SRC} + ) Modified: branches/cmake/ttssh2/puttyrev/CMakeLists.txt =================================================================== --- branches/cmake/ttssh2/puttyrev/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttssh2/puttyrev/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,13 +1,13 @@ -project(puttyrev) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - puttyrev.h - puttyrev.cpp - ) - -add_executable( - puttyrev - ${SRC} - ) +project(puttyrev) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + puttyrev.h + puttyrev.cpp + ) + +add_executable( + puttyrev + ${SRC} + ) Modified: branches/cmake/ttssh2/ttssh/CMakeLists.txt =================================================================== --- branches/cmake/ttssh2/ttssh/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttssh2/ttssh/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,15 +1,15 @@ -project(ttssh) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") - -set(SRC - resource.h - ttsecure.ico - ttssh.c - ttssh.rc - ) - -add_executable( - ttssh WIN32 - ${SRC} - ) +project(ttssh) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/") + +set(SRC + resource.h + ttsecure.ico + ttssh.c + ttssh.rc + ) + +add_executable( + ttssh WIN32 + ${SRC} + ) Modified: branches/cmake/ttssh2/ttxssh/CMakeLists.txt =================================================================== --- branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2019-01-28 14:14:41 UTC (rev 7413) +++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt 2019-01-28 14:15:01 UTC (rev 7414) @@ -1,4 +1,4 @@ -project(ttxssh) +project(ttxssh) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")