[Ttssh2-commit] [7415] htmlhelp削除

scmno****@osdn***** scmno****@osdn*****
2019年 1月 28日 (月) 23:15:21 JST


Revision: 7415
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7415
Author:   zmatsuo
Date:     2019-01-28 23:15:21 +0900 (Mon, 28 Jan 2019)
Log Message:
-----------
htmlhelp削除

# Conflicts:
#	TTProxy/CMakeLists.txt
#	TTXKanjiMenu/CMakeLists.txt
#	TTXSamples/TTXAdditionalTitle/CMakeLists.txt
#	TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
#	TTXSamples/TTXCommandLineOpt/CMakeLists.txt
#	TTXSamples/TTXRecurringCommand/CMakeLists.txt
#	TTXSamples/TTXResizeMenu/CMakeLists.txt
#	TTXSamples/TTXttyrec/CMakeLists.txt
#	teraterm/ttpcmn/CMakeLists.txt
#	teraterm/ttpdlg/CMakeLists.txt
#	teraterm/ttpfile/CMakeLists.txt
#	teraterm/ttpmacro/CMakeLists.txt
#	teraterm/ttpset/CMakeLists.txt
#	teraterm/ttptek/CMakeLists.txt

Modified Paths:
--------------
    branches/cmake/TTProxy/CMakeLists.txt
    branches/cmake/TTXKanjiMenu/CMakeLists.txt
    branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
    branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
    branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
    branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
    branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt
    branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt
    branches/cmake/teraterm/teraterm/CMakeLists.txt
    branches/cmake/teraterm/teraterm/tekwin.cpp
    branches/cmake/teraterm/teraterm/vtwin.cpp
    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/ttpmacro/errdlg.cpp
    branches/cmake/teraterm/ttpset/CMakeLists.txt
    branches/cmake/teraterm/ttptek/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:15:01 UTC (rev 7414)
+++ branches/cmake/TTProxy/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttproxy)
+project(ttproxy)
 
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
@@ -87,12 +87,6 @@
   .
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-uTTXBind @ 8")
 
 add_library(

Modified: branches/cmake/TTXKanjiMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXKanjiMenu/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXKanjiMenu/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttxkanjimenu)
+project(ttxkanjimenu)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -19,12 +19,6 @@
   .
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   ttxkanjimenu SHARED
   ${SRC}

Modified: branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXSamples/TTXAdditionalTitle/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(TTXAdditionalTitle)
+project(TTXAdditionalTitle)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -13,12 +13,6 @@
   ../../teraterm/common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   TTXAdditionalTitle SHARED
   ${SRC}

Modified: branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXSamples/TTXAlwaysOnTop/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(TTXAlwaysOnTop)
+project(TTXAlwaysOnTop)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -17,12 +17,6 @@
   ../../teraterm/common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   TTXAlwaysOnTop SHARED
   ${SRC}

Modified: branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXSamples/TTXCommandLineOpt/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(TTXCommandLineOpt)
+project(TTXCommandLineOpt)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -13,12 +13,6 @@
   ../../teraterm/common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   TTXCommandLineOpt SHARED
   ${SRC}

Modified: branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXSamples/TTXRecurringCommand/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(TTXRecurringCommand)
+project(TTXRecurringCommand)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -31,12 +31,6 @@
   ../../teraterm/common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   TTXRecurringCommand SHARED
   ${SRC}

Modified: branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXSamples/TTXResizeMenu/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(TTXResizeMenu)
+project(TTXResizeMenu)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -13,12 +13,6 @@
   ../../teraterm/common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   TTXResizeMenu SHARED
   ${SRC}

Modified: branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt
===================================================================
--- branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/TTXSamples/TTXttyrec/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(TTXttyrec)
+project(TTXttyrec)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
@@ -7,12 +7,6 @@
   ../../teraterm/common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   TTXttyplay SHARED
   TTXttyplay.c

Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -158,12 +158,6 @@
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
 endif()
 
-if(MINGW)
-  link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
-	)
-endif()
-
 add_executable(
   teraterm WIN32
   ${SRC}

Modified: branches/cmake/teraterm/teraterm/tekwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/tekwin.cpp	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/teraterm/tekwin.cpp	2019-01-28 14:15:21 UTC (rev 7415)
@@ -43,7 +43,7 @@
 #include "tt_res.h"
 #include "tekwin.h"
 #include "ttlib.h"
-#include "htmlhelp.h"
+#include <htmlhelp.h>
 #include "dlglib.h"
 #include <tchar.h>
 

Modified: branches/cmake/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/vtwin.cpp	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp	2019-01-28 14:15:21 UTC (rev 7415)
@@ -80,7 +80,7 @@
 #include "sizetip.h"
 #include "dnddlg.h"
 #include "tekwin.h"
-#include "htmlhelp.h"
+#include <htmlhelp.h>
 #include "compat_win.h"
 
 #include "initguid.h"

Modified: branches/cmake/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpcmn/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttpcmn/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttpcmn)
+project(ttpcmn)
 
 if (MSVC)
     string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
@@ -56,12 +56,6 @@
   .
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
-	)
-endif()
-  
 add_library(
   ttpcmn
   SHARED
@@ -84,5 +78,4 @@
   ttpcmn
   ole32
   setupapi
-  htmlhelp
   )

Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttpdlg)
+project(ttpdlg)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 
@@ -52,16 +52,9 @@
   ${ONIGURUMA_INCLUDE_DIRS}
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
-	${ONIGURUMA_LIBRARY_DIRS}
-	)
-else()
-  link_directories(
-	${ONIGURUMA_LIBRARY_DIRS}
-	)
-endif()
+link_directories(
+  ${ONIGURUMA_LIBRARY_DIRS}
+  )
 
 add_library(
   ttpdlg SHARED

Modified: branches/cmake/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpfile/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttpfile/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttpfile)
+project(ttpfile)
 
 if (MSVC)
     string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
@@ -56,12 +56,6 @@
   ../common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
-	)
-endif()
-
 add_library(
   ttpfile SHARED
   ${SRC}

Modified: branches/cmake/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpmacro/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttpmacro/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttpmacro)
+project(ttpmacro)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
@@ -106,12 +106,6 @@
   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}

Modified: branches/cmake/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/errdlg.cpp	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttpmacro/errdlg.cpp	2019-01-28 14:15:21 UTC (rev 7415)
@@ -44,7 +44,7 @@
 #include "errdlg.h"
 #include "ttmlib.h"
 #include "ttmparse.h"
-#include "htmlhelp.h"
+#include <htmlhelp.h>
 #include "dlglib.h"
 #include "ttmacro.h"
 

Modified: branches/cmake/teraterm/ttpset/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpset/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttpset/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttpset)
+project(ttpset)
 
 if (MSVC)
     string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
@@ -36,12 +36,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/../common
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
-	)
-endif()
-
 add_library(
   ttpset SHARED
   ${SRC}

Modified: branches/cmake/teraterm/ttptek/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttptek/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/teraterm/ttptek/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -1,4 +1,4 @@
-project(ttptek)
+project(ttptek)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
@@ -51,12 +51,6 @@
   ${SFMT_LIBRARY_DIRS}
   )
 
-if(MINGW)
-  link_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
-	)
-endif()
-
 add_library(
   ttptek SHARED
   ${SRC}
@@ -77,7 +71,6 @@
   optimized sfmt
   #
   iphlpapi
-  htmlhelp
   gdi32
   )
 

Modified: branches/cmake/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- branches/cmake/ttssh2/ttxssh/CMakeLists.txt	2019-01-28 14:15:01 UTC (rev 7414)
+++ branches/cmake/ttssh2/ttxssh/CMakeLists.txt	2019-01-28 14:15:21 UTC (rev 7415)
@@ -113,12 +113,6 @@
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DELAYLOAD:dnsapi.dll")
 endif()
 
-if(MINGW)
-  link_directories(
-	${CMAKE_SOURCE_DIR}/teraterm/htmlhelp
-	)
-endif()
-
 add_library(
   ttxssh SHARED
   ${SRC}


Ttssh2-commit メーリングリストの案内