Tera TermRevision: 7529
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7529
Author: zmatsuo
Date: 2019-03-29 01:39:07 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
MFC関連削除
- ライブラリ指定からMFC関連を削除
- 不要ファイル削除
- VS2017プロジェクトファイル保守
Modified Paths:
--------------
trunk/teraterm/teraterm/CMakeLists.txt
trunk/teraterm/teraterm/ttermpro.v15.vcxproj
trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters
trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
Removed Paths:
-------------
trunk/teraterm/common/stdafx.h
trunk/teraterm/teraterm/teraapp.h
-------------- next part --------------
Deleted: trunk/teraterm/common/stdafx.h
===================================================================
--- trunk/teraterm/common/stdafx.h 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/common/stdafx.h 2019-03-28 16:39:07 UTC (rev 7529)
@@ -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: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/CMakeLists.txt 2019-03-28 16:39:07 UTC (rev 7529)
@@ -98,10 +98,10 @@
tekwin.h
telnet.c
telnet.h
- teraapp.h
teraprn.cpp
teraprn.h
teraterm.cpp
+ teraterml.h
ttdde.c
ttdde.h
ttdialog.c
@@ -157,11 +157,7 @@
${SFMT_LIBRARY_DIRS}
)
-set(CMAKE_MFC_FLAG 1)
-
if (MSVC)
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:nafxcw.lib /NODEFAULTLIB:LIBCMT.lib")
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:nafxcwd.lib /NODEFAULTLIB:LIBCMTD.lib")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DELAYLOAD:imagehlp.dll /DELAYLOAD:user32.dll /DELAYLOAD:shell32.dll")
endif()
@@ -182,10 +178,6 @@
ttpfile
ttpset
ttptek
- optimized nafxcw.lib
- debug nafxcwd.lib
- optimized LIBCMT.lib
- debug LIBCMTD.lib
optimized onig.lib
debug onigd.lib
#
Deleted: trunk/teraterm/teraterm/teraapp.h
===================================================================
--- trunk/teraterm/teraterm/teraapp.h 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/teraapp.h 2019-03-28 16:39:07 UTC (rev 7529)
@@ -1,48 +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.
- */
-
-/* TERATERM.EXE, Main application class */
-
-class CTeraApp : public CWinApp
-{
-public:
- CTeraApp();
-
- //{{AFX_VIRTUAL(CTeraApp)
- public:
- virtual BOOL InitInstance();
- virtual int ExitInstance();
- virtual BOOL OnIdle(LONG lCount);
- virtual BOOL PreTranslateMessage(MSG* pMsg);
- //}}AFX_VIRTUAL
-
- //{{AFX_MSG(CTeraApp)
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-};
Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj 2019-03-28 16:39:07 UTC (rev 7529)
@@ -21,12 +21,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
- <UseOfMfc>Static</UseOfMfc>
+ <UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
- <UseOfMfc>Static</UseOfMfc>
+ <UseOfMfc>false</UseOfMfc>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -81,7 +81,7 @@
<AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -88,7 +88,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
</Link>
<Manifest>
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -127,7 +127,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
- <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>LIBCMT.lib;onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -134,7 +134,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
- <IgnoreSpecificDefaultLibraries>nafxcw.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
+ <IgnoreSpecificDefaultLibraries>
+ </IgnoreSpecificDefaultLibraries>
</Link>
<Manifest>
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -148,7 +149,8 @@
<ClCompile Include="..\common\dlglib.c" />
<ClCompile Include="..\common\dlglib_cpp.cpp" />
<ClCompile Include="..\common\dlglib_tmpl.cpp" />
- <ClCompile Include="..\common\stdafx.cpp" />
+ <ClCompile Include="..\common\tmfc.cpp" />
+ <ClCompile Include="..\common\tmfc_frame.cpp" />
<ClCompile Include="..\common\ttlib.c" />
<ClCompile Include="..\common\tipwin.cpp" />
<ClCompile Include="..\common\win16api.c" />
@@ -208,6 +210,7 @@
<ClInclude Include="..\common\dlglib.h" />
<ClInclude Include="..\common\tektypes.h" />
<ClInclude Include="..\common\teraterm.h" />
+ <ClInclude Include="..\common\tmfc.h" />
<ClInclude Include="..\common\tt-version.h" />
<ClInclude Include="..\common\ttcommon.h" />
<ClInclude Include="..\common\ttddecmnd.h" />
@@ -278,4 +281,4 @@
<UserProperties RESOURCE_FILE="ttermpro.rc" />
</VisualStudio>
</ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2019-03-28 16:39:07 UTC (rev 7529)
@@ -27,9 +27,6 @@
<ClCompile Include="filesys.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\common\stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="tekwin.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -144,6 +141,12 @@
<ClCompile Include="../ttpdlg/ttdlg.c">
<Filter>ttpdlg</Filter>
</ClCompile>
+ <ClCompile Include="..\common\tmfc_frame.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\common\tmfc.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\cygterm\cygterm.ico">
@@ -309,5 +312,8 @@
<ClInclude Include="../ttpdlg/ttdlg.h">
<Filter>ttpdlg</Filter>
</ClInclude>
+ <ClInclude Include="..\common\tmfc.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-03-28 16:39:07 UTC (rev 7529)
@@ -131,7 +131,6 @@
<ItemGroup>
<ClCompile Include="..\common\codeconv.cpp" />
<ClCompile Include="..\common\i18n.c" />
- <ClCompile Include="..\common\stdafx.cpp" />
<ClCompile Include="..\common\ttlib.c" />
<ClCompile Include="..\common\win16api.c" />
<ClCompile Include="errdlg.cpp" />
@@ -199,4 +198,4 @@
<UserProperties RESOURCE_FILE="ttpmacro.rc" />
</VisualStudio>
</ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2019-03-28 16:38:54 UTC (rev 7528)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2019-03-28 16:39:07 UTC (rev 7529)
@@ -34,9 +34,6 @@
<ClCompile Include="statdlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\common\stdafx.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="ttmacro.cpp">
<Filter>Source Files</Filter>
</ClCompile>