scmno****@osdn*****
scmno****@osdn*****
2018年 8月 22日 (水) 00:16:50 JST
Tera TermRevision: 7186
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7186
Author: zmatsuo
Date: 2018-08-22 00:16:50 +0900 (Wed, 22 Aug 2018)
Log Message:
-----------
VS2005を考慮
- termterm/vtdisp.cのdprintf()をOutputDebugPrintf()に置換
- tpmacro/ MFC関連のプロトタイプを修正
Modified Paths:
--------------
branches/cmake/CMakeLists.txt
branches/cmake/libs/SFMT.cmake
branches/cmake/libs/buildall.cmake
branches/cmake/libs/buildall_cmake.bat
branches/cmake/libs/oniguruma.cmake
branches/cmake/libs/openssl.cmake
branches/cmake/libs/putty.cmake
branches/cmake/libs/script_support.cmake
branches/cmake/libs/zlib.cmake
branches/cmake/teraterm/common/ttlib.c
branches/cmake/teraterm/common/ttlib.h
branches/cmake/teraterm/teraterm/vtdisp.c
branches/cmake/teraterm/ttpcmn/CMakeLists.txt
branches/cmake/teraterm/ttpdlg/CMakeLists.txt
branches/cmake/teraterm/ttpdlg/ttdlg.c
branches/cmake/teraterm/ttpfile/CMakeLists.txt
branches/cmake/teraterm/ttpmacro/inpdlg.cpp
branches/cmake/teraterm/ttpmacro/inpdlg.h
branches/cmake/teraterm/ttpmacro/msgdlg.cpp
branches/cmake/teraterm/ttpmacro/msgdlg.h
branches/cmake/teraterm/ttpmacro/statdlg.cpp
branches/cmake/teraterm/ttpmacro/statdlg.h
branches/cmake/teraterm/ttpmacro/ttmmain.cpp
branches/cmake/teraterm/ttpmacro/ttmmain.h
branches/cmake/teraterm/ttpset/CMakeLists.txt
branches/cmake/teraterm/ttptek/CMakeLists.txt
Added Paths:
-----------
branches/cmake/libs/getcmake.bat
branches/cmake/libs/getcmake.ps1
branches/cmake/teraterm/teraterm/stdafx.cpp
branches/cmake/teraterm/teraterm/stdafx.h
Removed Paths:
-------------
branches/cmake/teraterm/common/stdafx.cpp
branches/cmake/teraterm/common/stdafx.h
-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
@@ -20,8 +20,8 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_WIN32_WINNT=0x0a00")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_WIN32_WINNT=0x0a00")
if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
endif()
endif()
Modified: branches/cmake/libs/SFMT.cmake
===================================================================
--- branches/cmake/libs/SFMT.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/SFMT.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -53,7 +53,7 @@
set(SRC_URL "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/SFMT-src-1.5.1.zip")
set(SRC_ARC_HASH_SHA256 630d1dfa6b690c30472f75fa97ca90ba62f9c13c5add6c264fdac2c1d3a878f4)
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/SFMT")
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/SFMT")
set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src")
set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/src/${SRC_DIR_BASE}")
set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/SFMT/build_${TOOLSET}")
Modified: branches/cmake/libs/buildall.cmake
===================================================================
--- branches/cmake/libs/buildall.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/buildall.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -5,11 +5,6 @@
message(FATAL_ERROR "set CMAKE_GENERATOR!")
endif()
-# utf-8
-execute_process(
- COMMAND cmd.exe /c chcp 65001
- )
-
# build
execute_process(
COMMAND ${CMAKE_COMMAND} -DCMAKE_GENERATOR=${CMAKE_GENERATOR} -P oniguruma.cmake
Modified: branches/cmake/libs/buildall_cmake.bat
===================================================================
--- branches/cmake/libs/buildall_cmake.bat 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/buildall_cmake.bat 2018-08-21 15:16:50 UTC (rev 7186)
@@ -1,8 +1,26 @@
@echo off
setlocal
+cd /d %~dp0
set opt=
-:retry
+
+:retry_cmake
+set CMAKE=%~dp0cmake-3.11.4-win32-x86\bin\cmake.exe
+echo 1. \x8E\xA9\x95\xAA\x82\xCCcmake.exe\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(PATH\x82\xF0\x92ʂ\xB5\x82Ă\xA0\x82\xE9)
+echo 2. cmake\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9(\x82\xB1\x82̃t\x83H\x83\x8B\x83_\x82ɃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9)
+if exist %CMAKE% echo \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8Dς\xDD(%CMAKE%)
+
+set /p no="select no "
+if "%no%" == "1" set CMAKE="cmake.exe" & goto finish_cmake
+
+if exist %CMAKE% goto finish_cmake
+echo @echo off > ..\cmake.bat
+echo %CMAKE% %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >> ..\cmake.bat
+call getcmake.bat
+
+:finish_cmake
+
+:retry_vs
echo 1. Visual Studio 15 2017
echo 2. Visual Studio 14 2015
echo 3. Visual Studio 12 2013
@@ -15,7 +33,7 @@
set /p no="select no "
echo %no%
-if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & goto build_all
+if "%no%" == "1" set GENERATOR="Visual Studio 15 2017" & chcp 65001 & goto build_all
if "%no%" == "2" set GENERATOR="Visual Studio 14 2015" & goto build_all
if "%no%" == "3" set GENERATOR="Visual Studio 12 2013" & goto build_all
if "%no%" == "4" set GENERATOR="Visual Studio 11 2012" & goto build_all
@@ -25,13 +43,16 @@
if "%no%" == "9" set GENERATOR="NMake Makefiles" & set OPT=-DCMAKE_BUILD_TYPE=Release & goto build_all
if "%no%" == "z" set GENERATOR="Unix Makefiles" & goto build_all
echo ? retry
-goto retry
+goto retry_vs
:build_all
-set C=cmake -DCMAKE_GENERATOR=%GENERATOR% %OPT% -P buildall.cmake
+set C=%CMAKE% -DCMAKE_GENERATOR=%GENERATOR% %OPT% -P buildall.cmake
echo %C%
title %C%
pause
%C%
+
+:finish
+echo build complete
endlocal
pause
Added: branches/cmake/libs/getcmake.bat
===================================================================
--- branches/cmake/libs/getcmake.bat (rev 0)
+++ branches/cmake/libs/getcmake.bat 2018-08-21 15:16:50 UTC (rev 7186)
@@ -0,0 +1,8 @@
+ ＠ echo off
+setlocal
+cd /d %~dp0
+echo cmake\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82\xC4lib/cmake\x82ɓW\x8AJ\x82\xB5\x82܂\xB7
+pause
+powershell -NoProfile -ExecutionPolicy Unrestricted .\getcmake.ps1
+endlocal
+pause
Added: branches/cmake/libs/getcmake.ps1
===================================================================
--- branches/cmake/libs/getcmake.ps1 (rev 0)
+++ branches/cmake/libs/getcmake.ps1 2018-08-21 15:16:50 UTC (rev 7186)
@@ -0,0 +1,33 @@
+$CMAKE_URL = "https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip"
+$CMAKE_ZIP = ($CMAKE_URL -split "/")[-1]
+$CMAKE_DIR = [System.IO.Path]::GetFileNameWithoutExtension($CMAKE_ZIP)
+
+$CMAKE_ZIP = "download\cmake\" + $CMAKE_ZIP
+
+echo $CMAKE_URL
+echo $CMAKE_ZIP
+echo $CMAKE_DIR
+
+# TLS1.2 \x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (cmake.org\x82\xCD TLS1.2)
+# [Net.ServicePointManager]::SecurityProtocol
+# \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82\xC4 "Ssl3, Tls" \x82Əo\x82\xBD\x8Fꍇ\x81ATLS1.2\x82͖\xB3\x8C\xF8\x82ƂȂ\xC1\x82Ă\xA2\x82\xE9
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
+
+# \x93W\x8AJ\x8Dς݃t\x83H\x83\x8B\x83_\x82\xAA\x82\xA0\x82\xE9?
+if((Test-Path $CMAKE_DIR) -eq $true) {
+ # \x8D폜\x82\xB7\x82\xE9
+ Remove-Item -Recurse -Force $CMAKE_DIR
+ # \x8FI\x97\xB9\x82\xB7\x82\xE9
+ #exit
+}
+
+# \x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9
+if((Test-Path $CMAKE_ZIP) -eq $false) {
+ if((Test-Path "download\cmake") -ne $true) {
+ mkdir "download\cmake"
+ }
+ wget $CMAKE_URL -Outfile $CMAKE_ZIP
+}
+
+# \x93W\x8AJ\x82\xB7\x82\xE9
+Expand-Archive $CMAKE_ZIP -DestinationPath .
Modified: branches/cmake/libs/oniguruma.cmake
===================================================================
--- branches/cmake/libs/oniguruma.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/oniguruma.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -53,7 +53,7 @@
set(SRC_URL "https://github.com/kkos/oniguruma/releases/download/v6.8.2/onig-6.8.2.tar.gz")
set(SRC_ARC_HASH_SHA1 4bd58a64fcff233118dcdf6d1ad9607c67bdb878)
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/oniguruma")
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/oniguruma")
set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src")
set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/src/${SRC_DIR_BASE}")
set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/oniguruma/build_${TOOLSET}")
Modified: branches/cmake/libs/openssl.cmake
===================================================================
--- branches/cmake/libs/openssl.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/openssl.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -1,5 +1,5 @@
# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -P openssl.cmake
-# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=Release -P openssl.cmake
+# cmake -DCMAKE_GENERATOR="Visual Studio 15 2017" -DCMAKE_CONFIGURATION_TYPE=Release -P openssl.cmake
####
if(("${CMAKE_BUILD_TYPE}" STREQUAL "") AND ("${CMAKE_CONFIGURATION_TYPE}" STREQUAL ""))
@@ -53,7 +53,7 @@
set(SRC_URL "https://www.openssl.org/source/openssl-1.0.2o.tar.gz")
set(SRC_ARC_HASH_SHA256 ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d)
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/openssl")
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/openssl")
set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/openssl/src_${TOOLSET}")
set(SRC_DIR "${EXTRACT_DIR}/${SRC_DIR_BASE}")
@@ -78,6 +78,8 @@
find_program(
PERL perl.exe
+ HINTS c:/Perl64/bin
+ HINTS c:/Perl/bin
HINTS c:/cygwin/usr/bin
HINTS c:/cygwin64/usr/bin
)
@@ -141,7 +143,7 @@
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
find_program(
VCVARS32 vcvars32.bat
- HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8.0/VC/bin"
+ HINTS "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
)
else()
message(FATAL_ERROR "CMAKE_GENERATOR ${CMAKE_GENERATOR} not supported")
@@ -167,14 +169,25 @@
endif()
file(TO_NATIVE_PATH ${PERL} PERL_N)
file(TO_NATIVE_PATH ${INSTALL_DIR} INSTALL_DIR_N)
+ string(REGEX REPLACE [[^(.*)\\.*$]] [[\1]] PERL_N_PATH ${PERL_N})
file(APPEND "${SRC_DIR}/build_cmake.bat"
"del crypto\\buildinf.h\n"
- "${PERL_N} Configure no-asm ${CONFIG_TARGET} --prefix=${INSTALL_DIR_N}\n"
- "rem call ms\\do_ms.bat\n"
- "${PERL_N} util/mkfiles.pl > MINFO\n"
- "${PERL_N} util/mk1mf.pl no-asm VC-WIN32 > ms\\nt.mak\n"
- "nmake -f ms\\nt.mak install\n"
+ "set PATH=${PERL_N_PATH};%PATH%\n"
)
+ if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+ ## Visual Studio 2005 特別処理
+ # includeパスの設定
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "set SDK=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\n"
+ "set INCLUDE=%SDK%\\Include;%INCLUDE%\n"
+ "set LIB=%SDK%\\lib;%LIB%\n"
+ )
+ endif()
+ file(APPEND "${SRC_DIR}/build_cmake.bat"
+ "perl Configure no-asm ${CONFIG_TARGET} --prefix=${INSTALL_DIR_N}\n"
+ "call ms\\do_ms.bat\n"
+ "nmake -f ms\\nt.mak install ${NMAKE_OPTION}\n"
+ )
set(BUILD_CMAKE_BAT "${SRC_DIR}/build_cmake.bat")
file(TO_NATIVE_PATH ${BUILD_CMAKE_BAT} BUILD_CMAKE_BAT_N)
Modified: branches/cmake/libs/putty.cmake
===================================================================
--- branches/cmake/libs/putty.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/putty.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -5,7 +5,7 @@
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}/donwload/putty")
+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")
Modified: branches/cmake/libs/script_support.cmake
===================================================================
--- branches/cmake/libs/script_support.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/script_support.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -12,6 +12,8 @@
set(MSVC_TOOLSET_VERSION 100)
elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008")
set(MSVC_TOOLSET_VERSION 90)
+ elseif(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005")
+ set(MSVC_TOOLSET_VERSION 80)
else()
set(MSVC_TOOLSET_VERSION "Unknown")
message(FATAL_ERROR "unknown Visual Studio ${CMAKE_GENERATOR}")
Modified: branches/cmake/libs/zlib.cmake
===================================================================
--- branches/cmake/libs/zlib.cmake 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/libs/zlib.cmake 2018-08-21 15:16:50 UTC (rev 7186)
@@ -53,7 +53,7 @@
set(SRC_URL "https://zlib.net/zlib-1.2.11.tar.xz")
set(SRC_ARC_HASH_SHA256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066)
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/donwload/zlib")
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/zlib")
set(EXTRACT_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src")
set(SRC_DIR "${CMAKE_SOURCE_DIR}/build/zlib/src/${SRC_DIR_BASE}")
set(BUILD_DIR "${CMAKE_SOURCE_DIR}/build/zlib/build_${TOOLSET}")
Deleted: branches/cmake/teraterm/common/stdafx.cpp
===================================================================
--- branches/cmake/teraterm/common/stdafx.cpp 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/common/stdafx.cpp 2018-08-21 15:16:50 UTC (rev 7186)
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2011-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "stdafx.h"
-
Deleted: branches/cmake/teraterm/common/stdafx.h
===================================================================
--- branches/cmake/teraterm/common/stdafx.h 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/common/stdafx.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 1994-1998 T. Teranishi
- * (C) 2009-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-//
-// stdafx.h
-//
-
-#define VC_EXTRALEAN
-
-#include <afxwin.h>
-#include <afxext.h>
-
-#ifndef __WATCOMC__
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>
-#endif // _AFX_NO_AFXCMN_SUPPORT
-#endif
Modified: branches/cmake/teraterm/common/ttlib.c
===================================================================
--- branches/cmake/teraterm/common/ttlib.c 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/common/ttlib.c 2018-08-21 15:16:50 UTC (rev 7186)
@@ -1045,7 +1045,7 @@
return ret;
}
-void OutputDebugPrintf(char *fmt, ...) {
+void OutputDebugPrintf(const char *fmt, ...) {
char tmp[1024];
va_list arg;
va_start(arg, fmt);
@@ -1715,3 +1715,18 @@
*body = p1;
}
+
+#if 0
+void dprintf(char *format, ...)
+{
+ va_list args;
+ char buffer[1024];
+
+ va_start(args,format);
+
+ _vsnprintf_s(buffer,sizeof(buffer),_TRUNCATE,format,args);
+ strncat_s(buffer,sizeof(buffer),"\n",_TRUNCATE);
+
+ OutputDebugString(buffer);
+}
+#endif
Modified: branches/cmake/teraterm/common/ttlib.h
===================================================================
--- branches/cmake/teraterm/common/ttlib.h 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/common/ttlib.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -72,7 +72,7 @@
void get_lang_msg(const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
int get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, const char *iniFile);
BOOL doSelectFolder(HWND hWnd, char *path, int pathlen, char *def, char *msg);
-void OutputDebugPrintf(char *fmt, ...);
+void OutputDebugPrintf(const char *fmt, ...);
BOOL is_NT4();
int get_OPENFILENAME_SIZE();
BOOL IsWindows95();
Copied: branches/cmake/teraterm/teraterm/stdafx.cpp (from rev 7185, branches/cmake/teraterm/common/stdafx.cpp)
===================================================================
--- branches/cmake/teraterm/teraterm/stdafx.cpp (rev 0)
+++ branches/cmake/teraterm/teraterm/stdafx.cpp 2018-08-21 15:16:50 UTC (rev 7186)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2011-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "stdafx.h"
+
Copied: branches/cmake/teraterm/teraterm/stdafx.h (from rev 7185, branches/cmake/teraterm/common/stdafx.h)
===================================================================
--- branches/cmake/teraterm/teraterm/stdafx.h (rev 0)
+++ branches/cmake/teraterm/teraterm/stdafx.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+//
+// stdafx.h
+//
+
+#define VC_EXTRALEAN
+
+#include <afxwin.h>
+#include <afxext.h>
+
+#ifndef __WATCOMC__
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>
+#endif // _AFX_NO_AFXCMN_SUPPORT
+#endif
Modified: branches/cmake/teraterm/teraterm/vtdisp.c
===================================================================
--- branches/cmake/teraterm/teraterm/vtdisp.c 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/teraterm/vtdisp.c 2018-08-21 15:16:50 UTC (rev 7186)
@@ -220,20 +220,6 @@
return !IsWindowsVistaOrLater();
}
-
-void dprintf(char *format, ...)
-{
- va_list args;
- char buffer[1024];
-
- va_start(args,format);
-
- _vsnprintf_s(buffer,sizeof(buffer),_TRUNCATE,format,args);
- strncat_s(buffer,sizeof(buffer),"\n",_TRUNCATE);
-
- OutputDebugString(buffer);
-}
-
HBITMAP CreateScreenCompatibleBitmap(int width,int height)
{
HDC hdc;
@@ -240,7 +226,7 @@
HBITMAP hbm;
#ifdef _DEBUG
- dprintf("CreateScreenCompatibleBitmap : width = %d height = %d",width,height);
+ OutputDebugPrintf("CreateScreenCompatibleBitmap : width = %d height = %d\n",width,height);
#endif
hdc = GetDC(NULL);
@@ -251,7 +237,7 @@
#ifdef _DEBUG
if(!hbm)
- dprintf("CreateScreenCompatibleBitmap : fail in CreateCompatibleBitmap");
+ OutputDebugPrintf("CreateScreenCompatibleBitmap : fail in CreateCompatibleBitmap\n");
#endif
return hbm;
@@ -264,7 +250,7 @@
BITMAPINFO bmi;
#ifdef _DEBUG
- dprintf("CreateDIB24BPP : width = %d height = %d",width,height);
+ OutputDebugPrintf("CreateDIB24BPP : width = %d height = %d\n",width,height);
#endif
if(!width || !height)
@@ -296,7 +282,7 @@
HDC hdc;
#ifdef _DEBUG
- dprintf("CreateBitmapDC : hbm = %x",hbm);
+ OutputDebugPrintf("CreateBitmapDC : hbm = %x\n",hbm);
#endif
hdc = CreateCompatibleDC(NULL);
@@ -312,7 +298,7 @@
HBITMAP hbm;
#ifdef _DEBUG
- dprintf("DeleteBitmapDC : *hdc = %x",hdc);
+ OutputDebugPrintf("DeleteBitmapDC : *hdc = %x\n",hdc);
#endif
if(!hdc)
@@ -338,7 +324,7 @@
HBRUSH hBrush;
#ifdef _DEBUG
- dprintf("FillBitmapDC : hdc = %x color = %x",hdc,color);
+ OutputDebugPrintf("FillBitmapDC : hdc = %x color = %x\n",hdc,color);
#endif
if(!hdc)
@@ -588,7 +574,7 @@
WIN32_FIND_DATA fd;
#ifdef _DEBUG
- dprintf("Preload Picture : %s",src->file);
+ OutputDebugPrintf("Preload Picture : %s\n",src->file);
#endif
//\x83t\x83@\x83C\x83\x8B\x82\xF0\x93ǂݍ\x9E\x82\xDE
@@ -1265,7 +1251,7 @@
CopyRect(&BGPrevRect,&rect);
#ifdef _DEBUG
- dprintf("BGSetupPrimary : BGInSizeMove = %d",BGInSizeMove);
+ OutputDebugPrintf("BGSetupPrimary : BGInSizeMove = %d\n",BGInSizeMove);
#endif
//\x8D\xEC\x8BƗp DC \x8D쐬
Modified: branches/cmake/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpcmn/CMakeLists.txt 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpcmn/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
@@ -34,7 +34,7 @@
.
)
-if(${MINGW})
+if(MINGW)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
)
@@ -45,6 +45,14 @@
${SRC}
)
+if(MINGW)
+ set_target_properties(
+ ttpcmn
+ PROPERTIES PREFIX ""
+ SUFFIX ".dll"
+ )
+endif()
+
target_link_libraries(
ttpcmn
setupapi.lib
Modified: branches/cmake/teraterm/ttpdlg/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpdlg/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
@@ -15,12 +15,18 @@
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
-if(${MINGW})
+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()
+if(MSVC)
+ set(SRC_DEF ttpdlg.def)
+else()
+ set(SRC_DEF ttpdlg_mingw.def)
+endif()
+
set(SRC
../common/dlglib.c
../common/dlglib.h
@@ -33,6 +39,7 @@
ttpdlg.rc
ttpdlg-version.rc
${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+ ${SRC_DEF}
)
include_directories(
@@ -41,7 +48,7 @@
${ONIGURUMA_INCLUDE_DIRS}
)
-if(${MINGW})
+if(MINGW)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
${ONIGURUMA_LIBRARY_DIRS}
@@ -57,6 +64,14 @@
${SRC}
)
+if(MINGW)
+ set_target_properties(
+ ttpdlg
+ PROPERTIES PREFIX ""
+ SUFFIX ".dll"
+ )
+endif()
+
target_link_libraries(
ttpdlg
ttpcmn
Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c 2018-08-21 15:16:50 UTC (rev 7186)
@@ -91,7 +91,7 @@
static const TCHAR *KanjiOutList2[] = {"^[(B","^[(J","^[(H",NULL};
static const TCHAR *RussList[] = {"Windows","KOI8-R","CP 866","ISO 8859-5",NULL};
static const TCHAR *RussList2[] = {"Windows","KOI8-R",NULL};
-static const TCHAR *LocaleList[] = {"japanese","chinese", "chinese-simplified", "chinese-traditional", NULL};
+//static const TCHAR *LocaleList[] = {"japanese","chinese", "chinese-simplified", "chinese-traditional", NULL};
static const TCHAR *MetaList[] = {"off", "on", "left", "right", NULL};
static const TCHAR *MetaList2[] = {"off", "on", NULL};
Modified: branches/cmake/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpfile/CMakeLists.txt 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpfile/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
@@ -43,7 +43,7 @@
../common
)
-if(${MINGW})
+if(MINGW)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
)
@@ -54,6 +54,14 @@
${SRC}
)
+if(MINGW)
+ set_target_properties(
+ ttpfile
+ PROPERTIES PREFIX ""
+ SUFFIX ".dll"
+ )
+endif()
+
target_link_libraries(
ttpfile
ttpcmn
Modified: branches/cmake/teraterm/ttpmacro/inpdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/inpdlg.cpp 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/inpdlg.cpp 2018-08-21 15:16:50 UTC (rev 7186)
@@ -135,7 +135,7 @@
EndDialog(IDOK);
}
-LONG CInpDlg::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CInpDlg::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
{
RECT R;
Modified: branches/cmake/teraterm/ttpmacro/inpdlg.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/inpdlg.h 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/inpdlg.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -53,7 +53,7 @@
//{{AFX_MSG(CInpDlg)
virtual BOOL OnInitDialog();
virtual void OnOK();
- afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
+ afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
//}}AFX_MSG
void Relocation(BOOL is_init, int WW);
DECLARE_MESSAGE_MAP()
Modified: branches/cmake/teraterm/ttpmacro/msgdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/msgdlg.cpp 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/msgdlg.cpp 2018-08-21 15:16:50 UTC (rev 7186)
@@ -120,7 +120,7 @@
return TRUE;
}
-LONG CMsgDlg::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CMsgDlg::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
{
RECT R;
Modified: branches/cmake/teraterm/ttpmacro/msgdlg.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/msgdlg.h 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/msgdlg.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -52,7 +52,7 @@
//{{AFX_MSG(CMsgDlg)
virtual BOOL OnInitDialog();
- afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
+ afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
//}}AFX_MSG
void Relocation(BOOL is_init, int WW);
DECLARE_MESSAGE_MAP()
Modified: branches/cmake/teraterm/ttpmacro/statdlg.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/statdlg.cpp 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/statdlg.cpp 2018-08-21 15:16:50 UTC (rev 7186)
@@ -158,7 +158,7 @@
delete this;
}
-LONG CStatDlg::OnExitSizeMove(UINT wParam, LONG lParam)
+LRESULT CStatDlg::OnExitSizeMove(WPARAM wParam, LPARAM lParam)
{
RECT R;
@@ -178,7 +178,7 @@
return CDialog::DefWindowProc(WM_EXITSIZEMOVE,wParam,lParam);
}
-LONG CStatDlg::OnSetForceForegroundWindow(UINT wParam, LONG lParam)
+LRESULT CStatDlg::OnSetForceForegroundWindow(WPARAM wParam, LPARAM lParam)
{
DWORD pid;
DWORD targetid;
Modified: branches/cmake/teraterm/ttpmacro/statdlg.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/statdlg.h 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/statdlg.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -56,8 +56,8 @@
//{{AFX_MSG(CStatDlg)
virtual BOOL OnInitDialog();
- afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
- afx_msg LONG OnSetForceForegroundWindow(UINT wParam, LONG lParam);
+ afx_msg LRESULT OnExitSizeMove(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnSetForceForegroundWindow(WPARAM wParam, LPARAM lParam);
//}}AFX_MSG
void Relocation(BOOL is_init, int WW);
DECLARE_MESSAGE_MAP()
Modified: branches/cmake/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmmain.cpp 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/ttmmain.cpp 2018-08-21 15:16:50 UTC (rev 7186)
@@ -502,7 +502,7 @@
CDialog::OnSysColorChange();
}
-void CCtrlWindow::OnTimer(UINT nIDEvent)
+void CCtrlWindow::OnTimer(UINT_PTR nIDEvent)
{
BOOL TimeOut;
@@ -593,7 +593,7 @@
return CDialog::PreTranslateMessage(pMsg);
}
-LONG CCtrlWindow::OnDdeCmndEnd(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeCmndEnd(WPARAM wParam, LPARAM lParam)
{
if (TTLStatus == IdTTLWaitCmndResult) {
LockVar();
@@ -608,7 +608,7 @@
return 0;
}
-LONG CCtrlWindow::OnDdeComReady(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeComReady(WPARAM wParam, LPARAM lParam)
{
ComReady = wParam;
if ((TTLStatus == IdTTLWait) ||
@@ -644,7 +644,7 @@
return 0;
}
-LONG CCtrlWindow::OnDdeReady(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeReady(WPARAM wParam, LPARAM lParam)
{
if (TTLStatus != IdTTLInitDDE) {
return 0;
@@ -662,7 +662,7 @@
return 0;
}
-LONG CCtrlWindow::OnDdeEnd(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnDdeEnd(WPARAM wParam, LPARAM lParam)
{
EndDDE();
if ((TTLStatus == IdTTLWaitCmndEnd) ||
@@ -691,7 +691,7 @@
return 0;
}
-LONG CCtrlWindow::OnMacroBringup(UINT wParam, LONG lParam)
+LRESULT CCtrlWindow::OnMacroBringup(WPARAM wParam, LPARAM lParam)
{
DWORD pid;
DWORD thisThreadId;
Modified: branches/cmake/teraterm/ttpmacro/ttmmain.h
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttmmain.h 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpmacro/ttmmain.h 2018-08-21 15:16:50 UTC (rev 7186)
@@ -73,12 +73,12 @@
afx_msg void OnGetMinMaxInfo(MINMAXINFO* lpMMI);
afx_msg HCURSOR OnQueryDragIcon();
afx_msg void OnSysColorChange();
- afx_msg void OnTimer(UINT nIDEvent);
- afx_msg LONG OnDdeCmndEnd(UINT wParam, LONG lParam);
- afx_msg LONG OnDdeComReady(UINT wParam, LONG lParam);
- afx_msg LONG OnDdeReady(UINT wParam, LONG lParam);
- afx_msg LONG OnDdeEnd(UINT wParam, LONG lParam);
- afx_msg LONG OnMacroBringup(UINT wParam, LONG lParam);
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
+ afx_msg LRESULT OnDdeCmndEnd(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDdeComReady(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDdeReady(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnDdeEnd(WPARAM wParam, LPARAM lParam);
+ afx_msg LRESULT OnMacroBringup(WPARAM wParam, LPARAM lParam);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
Modified: branches/cmake/teraterm/ttpset/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttpset/CMakeLists.txt 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttpset/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
@@ -25,7 +25,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/../common
)
-if(${MINGW})
+if(MINGW)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
)
@@ -36,6 +36,14 @@
${SRC}
)
+if(MINGW)
+ set_target_properties(
+ ttpset
+ PROPERTIES PREFIX ""
+ SUFFIX ".dll"
+ )
+endif()
+
target_link_libraries(
ttpset
ttpcmn
Modified: branches/cmake/teraterm/ttptek/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/ttptek/CMakeLists.txt 2018-08-21 14:53:26 UTC (rev 7185)
+++ branches/cmake/teraterm/ttptek/CMakeLists.txt 2018-08-21 15:16:50 UTC (rev 7186)
@@ -41,7 +41,7 @@
${SFMT_LIBRARY_DIRS}
)
-if(${MINGW})
+if(MINGW)
link_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../htmlhelp
)
@@ -52,6 +52,14 @@
${SRC}
)
+if(MINGW)
+ set_target_properties(
+ ttptek
+ PROPERTIES PREFIX ""
+ SUFFIX ".dll"
+ )
+endif()
+
target_link_libraries(
ttptek
ttpcmn