Tera TermRevision: 8568
https://osdn.net/projects/ttssh2/scm/svn/commits/8568
Author: zmatsuo
Date: 2020-02-27 01:27:26 +0900 (Thu, 27 Feb 2020)
Log Message:
-----------
common_static.lib にあるファイルは複数回ビルドしないようにした
Modified Paths:
--------------
trunk/TTProxy/CMakeLists.txt
trunk/TTProxy/TTProxy.v16.vcxproj
trunk/TTProxy/TTProxy.v16.vcxproj.filters
trunk/TTProxy/TTProxy.vcproj
trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt
trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj
trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj.filters
trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj
trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt
trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj
trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters
trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
trunk/TTXSamples/TTXViewMode/CMakeLists.txt
trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj
trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters
trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj
trunk/teraterm/common/CMakeLists.txt
trunk/teraterm/common/common_static.v8.vcproj
trunk/teraterm/teraterm/CMakeLists.txt
trunk/teraterm/teraterm/ttermpro.v16.vcxproj
trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters
trunk/teraterm/teraterm/ttermpro.vcproj
trunk/teraterm/ttpcmn/CMakeLists.txt
trunk/teraterm/ttpfile/CMakeLists.txt
trunk/teraterm/ttpmacro/CMakeLists.txt
trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj
trunk/teraterm/ttpmacro/ttpmacro.vcproj
trunk/teraterm/ttptek/CMakeLists.txt
trunk/teraterm/ttptek/ttptek.vcproj
trunk/ttssh2/ttxssh/CMakeLists.txt
trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
trunk/ttssh2/ttxssh/ttxssh.vcproj
-------------- next part --------------
Modified: trunk/TTProxy/CMakeLists.txt
===================================================================
--- trunk/TTProxy/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTProxy/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -6,17 +6,12 @@
set(COMMON_SRC
../teraterm/common/ttlib.h
- ../teraterm/common/ttlib.c
../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
Modified: trunk/TTProxy/TTProxy.v16.vcxproj
===================================================================
--- trunk/TTProxy/TTProxy.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTProxy/TTProxy.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -139,22 +139,6 @@
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\teraterm\common\dlglib.c">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="..\teraterm\common\ttlib.c">
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
- <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
- </ClCompile>
<ClCompile Include="StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
Modified: trunk/TTProxy/TTProxy.v16.vcxproj.filters
===================================================================
--- trunk/TTProxy/TTProxy.v16.vcxproj.filters 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTProxy/TTProxy.v16.vcxproj.filters 2020-02-26 16:27:26 UTC (rev 8568)
@@ -27,18 +27,6 @@
<ClCompile Include="YCL\include\YCL\libc.cpp">
<Filter>YCL</Filter>
</ClCompile>
- <ClCompile Include="..\teraterm\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\teraterm\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\teraterm\common\dlglib_cpp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\teraterm\common\dlglib_tmpl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="TTProxy.rc">
Modified: trunk/TTProxy/TTProxy.vcproj
===================================================================
--- trunk/TTProxy/TTProxy.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTProxy/TTProxy.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -216,66 +216,6 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\teraterm\common\dlglib.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\teraterm\common\dlglib_cpp.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\teraterm\common\dlglib_tmpl.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="StdAfx.cpp"
>
<FileConfiguration
@@ -300,26 +240,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\teraterm\common\ttlib.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="TTProxy.cpp"
>
<FileConfiguration
Modified: trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXCheckUpdate/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -15,10 +15,6 @@
#
../../teraterm/common/codeconv.h
../../teraterm/common/dlglib.h
- ../../teraterm/common/dlglib.c
- ../../teraterm/common/dlglib_cpp.cpp
- ../../teraterm/common/dlglib_tmpl.cpp
- ../../teraterm/common/ttlib.c
../../teraterm/common/getcontent.h
)
Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -95,10 +95,6 @@
<ClCompile Include="parse.cpp" />
<ClCompile Include="TTXCheckUpdate.c" />
<ClCompile Include="../../libs/cJSON/cJSON.c" />
- <ClCompile Include="../../teraterm/common/dlglib.c" />
- <ClCompile Include="../../teraterm/common/dlglib_cpp.cpp" />
- <ClCompile Include="../../teraterm/common/dlglib_tmpl.cpp" />
- <ClCompile Include="../../teraterm/common/ttlib.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="parse.h" />
Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj.filters
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj.filters 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj.filters 2020-02-26 16:27:26 UTC (rev 8568)
@@ -33,15 +33,6 @@
<ClCompile Include="../../teraterm/common/ttlib.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="../../teraterm/common/dlglib.c">
- <Filter>common</Filter>
- </ClCompile>
- <ClCompile Include="../../teraterm/common/dlglib_cpp.cpp">
- <Filter>common</Filter>
- </ClCompile>
- <ClCompile Include="../../teraterm/common/dlglib_tmpl.cpp">
- <Filter>common</Filter>
- </ClCompile>
<ClCompile Include="../../libs/cJSON/cJSON.c">
<Filter>cJSON</Filter>
</ClCompile>
@@ -71,4 +62,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v8.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -181,26 +181,10 @@
>
</File>
<File
- RelativePath="..\..\teraterm\common\dlglib.c"
- >
- </File>
- <File
RelativePath="..\..\teraterm\common\dlglib.h"
>
</File>
<File
- RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\ttlib.c"
- >
- </File>
- <File
RelativePath="..\..\teraterm\common\ttlib.h"
>
</File>
Modified: trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXRecurringCommand/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -4,10 +4,6 @@
set(COMMON_SRC
../../teraterm/common/dlglib.h
- ../../teraterm/common/dlglib.c
- ../../teraterm/common/dlglib_cpp.cpp
- ../../teraterm/common/dlglib_tmpl.cpp
- ../../teraterm/common/ttlib.c
)
source_group(
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -93,10 +93,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\teraterm\common\dlglib.c" />
- <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
- <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
- <ClCompile Include="..\..\teraterm\common\ttlib.c" />
<ClCompile Include="TTXRecurringCommand.c" />
</ItemGroup>
<ItemGroup>
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.v16.vcxproj.filters 2020-02-26 16:27:26 UTC (rev 8568)
@@ -21,18 +21,6 @@
<ClCompile Include="TTXRecurringCommand.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\teraterm\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\teraterm\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -181,22 +181,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\teraterm\common\dlglib.c"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\ttlib.c"
- >
- </File>
- <File
RelativePath="TTXRecurringCommand.c"
>
</File>
Modified: trunk/TTXSamples/TTXViewMode/CMakeLists.txt
===================================================================
--- trunk/TTXSamples/TTXViewMode/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXViewMode/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -4,10 +4,6 @@
set(COMMON_SRC
../../teraterm/common/dlglib.h
- ../../teraterm/common/dlglib.c
- ../../teraterm/common/dlglib_cpp.cpp
- ../../teraterm/common/dlglib_tmpl.cpp
- ../../teraterm/common/ttlib.c
)
source_group(
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -57,7 +57,6 @@
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader />
@@ -93,10 +92,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\teraterm\common\dlglib.c" />
- <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
- <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
- <ClCompile Include="..\..\teraterm\common\ttlib.c" />
<ClCompile Include="TTXViewMode.c" />
</ItemGroup>
<ItemGroup>
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.v16.vcxproj.filters 2020-02-26 16:27:26 UTC (rev 8568)
@@ -21,18 +21,6 @@
<ClCompile Include="TTXViewMode.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\teraterm\common\dlglib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\teraterm\common\ttlib.c">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -181,22 +181,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\teraterm\common\dlglib.c"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\ttlib.c"
- >
- </File>
- <File
RelativePath="TTXViewMode.c"
>
</File>
Modified: trunk/teraterm/common/CMakeLists.txt
===================================================================
--- trunk/teraterm/common/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/common/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -15,8 +15,8 @@
dllutil.h
getcontent.cpp
getcontent.h
- i18n.c
i18n_static.c
+ i18n_static.c
i18n.h
layer_for_unicode.cpp
layer_for_unicode.h
Modified: trunk/teraterm/common/common_static.v8.vcproj
===================================================================
--- trunk/teraterm/common/common_static.v8.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/common/common_static.v8.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -233,11 +233,11 @@
>
</File>
<File
- RelativePath=".\i18n_static.c"
+ RelativePath="..\common\i18n.h"
>
</File>
<File
- RelativePath=".\i18n.h"
+ RelativePath=".\i18n_static.c"
>
</File>
<File
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/teraterm/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -112,27 +112,16 @@
../common/ttlib.c
../common/ttlib.h
../common/dlglib.h
- ../common/dlglib.c
- ../common/dlglib_cpp.cpp
- ../common/dlglib_tmpl.cpp
../common/win16api.h
- ../common/win16api.c
../common/codemap.h
../common/compat_w95.h
../common/compat_win.h
- ../common/compat_win.cpp
- ../common/tmfc.cpp
../common/tmfc.h
- ../common/tmfc_frame.cpp
../common/i18n.h
- ../common/dllutil.cpp
../common/dllutil.h
../common/codeconv.h
- ../common/codeconv.cpp
../common/tipwin.h
- ../common/tipwin.cpp
../common/layer_for_unicode.h
- ../common/layer_for_unicode.cpp
#
../teraterm/unisym2decsp.map
../teraterm/uni2sjis.map
@@ -235,14 +224,6 @@
uuid
)
-add_dependencies(
- teraterm
- ttpcmn
- ttpfile
- ttpset
- ttptek
- )
-
####
configure_file(
svnversion.h.in
Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -143,18 +143,7 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\common\codeconv.cpp" />
- <ClCompile Include="..\common\compat_win.cpp" />
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="..\common\dlglib_cpp.cpp" />
- <ClCompile Include="..\common\dlglib_tmpl.cpp" />
- <ClCompile Include="..\common\dllutil.cpp" />
- <ClCompile Include="..\common\layer_for_unicode.cpp" />
- <ClCompile Include="..\common\tipwin.cpp" />
- <ClCompile Include="..\common\tmfc.cpp" />
- <ClCompile Include="..\common\tmfc_frame.cpp" />
<ClCompile Include="..\common\ttlib.c" />
- <ClCompile Include="..\common\win16api.c" />
<ClCompile Include="addsetting.cpp" />
<ClCompile Include="buffer.c" />
<ClCompile Include="clipboar.c" />
Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters 2020-02-26 16:27:26 UTC (rev 8568)
@@ -114,42 +114,9 @@
<ClCompile Include="addsetting.cpp">
<Filter>dialog</Filter>
</ClCompile>
- <ClCompile Include="..\common\dlglib.c">
- <Filter>dialog</Filter>
- </ClCompile>
- <ClCompile Include="..\common\win16api.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\dlglib_cpp.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\dlglib_tmpl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\tipwin.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\codeconv.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\dllutil.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\common\compat_win.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<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>
- <ClCompile Include="..\common\layer_for_unicode.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="unicode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/teraterm/ttermpro.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -213,26 +213,6 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\common\codeconv.cpp"
- >
- </File>
- <File
- RelativePath="..\common\compat_win.cpp"
- >
- </File>
- <File
- RelativePath="..\common\dlglib_cpp.cpp"
- >
- </File>
- <File
- RelativePath="..\common\dlglib_tmpl.cpp"
- >
- </File>
- <File
- RelativePath="..\common\dllutil.cpp"
- >
- </File>
- <File
RelativePath="filesys.cpp"
>
</File>
@@ -249,25 +229,9 @@
>
</File>
<File
- RelativePath="..\common\tipwin.cpp"
- >
- </File>
- <File
- RelativePath="..\common\tmfc.cpp"
- >
- </File>
- <File
- RelativePath="..\common\tmfc_frame.cpp"
- >
- </File>
- <File
RelativePath="vtwin.cpp"
>
</File>
- <File
- RelativePath="..\common\win16api.c"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
@@ -278,6 +242,10 @@
>
</File>
<File
+ RelativePath="debug_pp.rc"
+ >
+ </File>
+ <File
RelativePath="..\common\tek.ico"
>
</File>
@@ -306,10 +274,6 @@
>
</File>
<File
- RelativePath="debug_pp.rc"
- >
- </File>
- <File
RelativePath="..\common\vt.ico"
>
</File>
@@ -431,6 +395,10 @@
>
</File>
<File
+ RelativePath="..\common\layer_for_unicode.h"
+ >
+ </File>
+ <File
RelativePath="sizetip.h"
>
</File>
@@ -571,86 +539,74 @@
>
</File>
<File
- RelativePath="..\common\dlglib.c"
+ RelativePath="clipboarddlg.cpp"
>
</File>
<File
- RelativePath="..\common\dlglib.h"
+ RelativePath="clipboarddlg.h"
>
</File>
<File
- RelativePath="dnddlg.cpp"
+ RelativePath="debug_pp.cpp"
>
</File>
<File
- RelativePath="dnddlg.h"
+ RelativePath="debug_pp.h"
>
</File>
<File
- RelativePath="ftdlg.cpp"
+ RelativePath="..\common\dlglib.h"
>
</File>
<File
- RelativePath=".\ftdlg.h"
+ RelativePath="dnddlg.cpp"
>
</File>
<File
- RelativePath="prnabort.cpp"
+ RelativePath="dnddlg.h"
>
</File>
<File
- RelativePath=".\prnabort.h"
+ RelativePath="..\ttpmacro\fileread.cpp"
>
</File>
<File
- RelativePath="protodlg.cpp"
+ RelativePath="..\ttpmacro\fileread.h"
>
</File>
<File
- RelativePath=".\protodlg.h"
+ RelativePath="ftdlg.cpp"
>
</File>
<File
- RelativePath="ttdialog.c"
+ RelativePath=".\ftdlg.h"
>
</File>
<File
- RelativePath=".\ttdialog.h"
+ RelativePath="ftdlg_lite.cpp"
>
</File>
<File
- RelativePath="unicode.h"
+ RelativePath="ftdlg_lite.h"
>
</File>
<File
- RelativePath="unicode.cpp"
+ RelativePath="prnabort.cpp"
>
</File>
<File
- RelativePath="..\ttpmacro\fileread.cpp"
+ RelativePath=".\prnabort.h"
>
</File>
<File
- RelativePath="..\ttpmacro\fileread.h"
+ RelativePath="protodlg.cpp"
>
</File>
<File
- RelativePath="..\common\layer_for_unicode.cpp"
+ RelativePath=".\protodlg.h"
>
</File>
<File
- RelativePath="..\common\layer_for_unicode.h"
- >
- </File>
- <File
- RelativePath="ftdlg_lite.cpp"
- >
- </File>
- <File
- RelativePath="ftdlg_lite.h"
- >
- </File>
- <File
RelativePath="sendmem.cpp"
>
</File>
@@ -659,19 +615,19 @@
>
</File>
<File
- RelativePath="clipboarddlg.cpp"
+ RelativePath="ttdialog.c"
>
</File>
<File
- RelativePath="clipboarddlg.h"
+ RelativePath="ttdialog.h"
>
</File>
<File
- RelativePath="debug_pp.cpp"
+ RelativePath="unicode.cpp"
>
</File>
<File
- RelativePath="debug_pp.h"
+ RelativePath="unicode.h"
>
</File>
</Filter>
Modified: trunk/teraterm/ttpcmn/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpcmn/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttpcmn/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -6,6 +6,7 @@
../common/teraterm.h
../common/tttypes.h
../common/i18n.h
+ ../common/i18n.c
../common/ttlib.c
../common/ttlib.h
../common/servicenames.c
Modified: trunk/teraterm/ttpfile/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpfile/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttpfile/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -3,14 +3,10 @@
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.h
../common/ttlib.c
- ../common/ttlib.h
../common/win16api.h
- ../common/win16api.c
)
source_group(
Modified: trunk/teraterm/ttpmacro/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttpmacro/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttpmacro/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -62,24 +62,13 @@
../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
../common/dllutil.h
- ../common/dllutil.cpp
../common/layer_for_unicode.h
- ../common/layer_for_unicode.cpp
)
source_group(
Modified: trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttpmacro/ttpmacro.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -129,17 +129,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\common\codeconv.cpp" />
- <ClCompile Include="..\common\compat_win.cpp" />
- <ClCompile Include="..\common\dlglib.c" />
- <ClCompile Include="..\common\dlglib_cpp.cpp" />
- <ClCompile Include="..\common\dlglib_tmpl.cpp" />
- <ClCompile Include="..\common\dllutil.cpp" />
- <ClCompile Include="..\common\layer_for_unicode.cpp" />
- <ClCompile Include="..\common\tmfc.cpp" />
- <ClCompile Include="..\common\tmfc_frame.cpp" />
<ClCompile Include="..\common\ttlib.c" />
- <ClCompile Include="..\common\win16api.c" />
<ClCompile Include="ListDlg.cpp" />
<ClCompile Include="errdlg.cpp" />
<ClCompile Include="fileread.cpp" />
Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -208,30 +208,10 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
- RelativePath="..\common\codeconv.cpp"
- >
- </File>
- <File
RelativePath="..\common\compat_win.cpp"
>
</File>
<File
- RelativePath="..\common\dlglib.c"
- >
- </File>
- <File
- RelativePath="..\common\dlglib_cpp.cpp"
- >
- </File>
- <File
- RelativePath="..\common\dlglib_tmpl.cpp"
- >
- </File>
- <File
- RelativePath="..\common\dllutil.cpp"
- >
- </File>
- <File
RelativePath="errdlg.cpp"
>
</File>
@@ -256,14 +236,6 @@
>
</File>
<File
- RelativePath="..\common\tmfc.cpp"
- >
- </File>
- <File
- RelativePath="..\common\tmfc_frame.cpp"
- >
- </File>
- <File
RelativePath="ttmacro.cpp"
>
</File>
@@ -275,14 +247,6 @@
RelativePath="ttmmain.cpp"
>
</File>
- <File
- RelativePath="..\common\win16api.c"
- >
- </File>
- <File
- RelativePath="..\common\layer_for_unicode.cpp"
- >
- </File>
</Filter>
<Filter
Name="Header Files"
@@ -305,6 +269,10 @@
>
</File>
<File
+ RelativePath="..\common\dllutil.h"
+ >
+ </File>
+ <File
RelativePath="errdlg.h"
>
</File>
@@ -317,6 +285,10 @@
>
</File>
<File
+ RelativePath="..\common\layer_for_unicode.h"
+ >
+ </File>
+ <File
RelativePath="ListDlg.h"
>
</File>
@@ -388,14 +360,6 @@
RelativePath="..\common\win16api.h"
>
</File>
- <File
- RelativePath="..\common\layer_for_unicode.h"
- >
- </File>
- <File
- RelativePath="..\common\dllutil.h"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/teraterm/ttptek/CMakeLists.txt
===================================================================
--- trunk/teraterm/ttptek/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttptek/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -8,7 +8,6 @@
../common/ttlib.c
../common/ttlib.h
../common/codeconv.h
- ../common/codeconv.cpp
)
source_group(
Modified: trunk/teraterm/ttptek/ttptek.vcproj
===================================================================
--- trunk/teraterm/ttptek/ttptek.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/teraterm/ttptek/ttptek.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -69,7 +69,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
+ AdditionalDependencies="common_static.lib User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
@@ -162,7 +162,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
+ AdditionalDependencies="common_static.lib User32.lib gdi32.lib SHELL32.lib ole32.lib ttpcmn.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(OutDir)"
Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt 2020-02-26 16:27:26 UTC (rev 8568)
@@ -87,23 +87,14 @@
../../teraterm/teraterm/WSAAsyncGetAddrInfo.c
../../teraterm/common/ttcommon.h
../../teraterm/common/i18n.h
- ../../teraterm/common/i18n_static.c
../../teraterm/common/ttlib.h
../../teraterm/common/ttlib.c
../../teraterm/common/dlglib.h
- ../../teraterm/common/dlglib.c
- ../../teraterm/common/dlglib_cpp.cpp
- ../../teraterm/common/dlglib_tmpl.cpp
../../teraterm/common/servicenames.h
- ../../teraterm/common/codeconv.cpp
../../teraterm/common/codeconv.h
- ../../teraterm/common/tipwin.cpp
../../teraterm/common/tipwin.h
- ../../teraterm/common/layer_for_unicode.cpp
../../teraterm/common/layer_for_unicode.h
- ../../teraterm/common/compat_win.cpp
../../teraterm/common/compat_win.h
- ../../teraterm/common/dllutil.cpp
../../teraterm/common/dllutil.h
)
Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -141,15 +141,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
- <ClCompile Include="..\..\teraterm\common\compat_win.cpp" />
- <ClCompile Include="..\..\teraterm\common\dlglib.c" />
- <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
- <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
- <ClCompile Include="..\..\teraterm\common\dllutil.cpp" />
- <ClCompile Include="..\..\teraterm\common\i18n_static.c" />
- <ClCompile Include="..\..\teraterm\common\layer_for_unicode.cpp" />
- <ClCompile Include="..\..\teraterm\common\tipwin.cpp" />
<ClCompile Include="..\..\teraterm\common\ttlib.c" />
<ClCompile Include="..\..\teraterm\teraterm\WSAAsyncGetAddrInfo.c" />
<ClCompile Include="..\matcher\matcher.c" />
@@ -243,4 +234,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj 2020-02-26 16:26:42 UTC (rev 8567)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj 2020-02-26 16:27:26 UTC (rev 8568)
@@ -240,6 +240,14 @@
>
</File>
<File
+ RelativePath="..\..\teraterm\common\codeconv.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\teraterm\common\compat_win.h"
+ >
+ </File>
+ <File
RelativePath="config.h"
>
</File>
@@ -248,6 +256,10 @@
>
</File>
<File
+ RelativePath="..\..\teraterm\common\dllutil.h"
+ >
+ </File>
+ <File
RelativePath="dns.h"
>
</File>
@@ -300,6 +312,10 @@
>
</File>
<File
+ RelativePath="..\..\teraterm\common\layer_for_unicode.h"
+ >
+ </File>
+ <File
RelativePath="pkt.h"
>
</File>
@@ -331,22 +347,6 @@
RelativePath="x11util.h"
>
</File>
- <File
- RelativePath="..\..\teraterm\common\codeconv.h"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\layer_for_unicode.h"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\compat_win.h"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dllutil.h"
- >
- </File>
</Filter>
<Filter
Name="Source Files"
@@ -372,26 +372,10 @@
>
</File>
<File
- RelativePath="..\..\teraterm\common\codeconv.cpp"
- >
- </File>
- <File
RelativePath="crypt.c"
>
</File>
<File
- RelativePath="..\..\teraterm\common\dlglib.c"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_cpp.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dlglib_tmpl.cpp"
- >
- </File>
- <File
RelativePath="dns.c"
>
</File>
@@ -448,10 +432,6 @@
>
</File>
<File
- RelativePath="..\..\teraterm\common\i18n_static.c"
- >
- </File>
- <File
RelativePath="kex.c"
>
</File>
@@ -480,14 +460,6 @@
>
</File>
<File
- RelativePath="..\..\teraterm\common\tipwin.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\ttlib.c"
- >
- </File>
- <File
RelativePath="ttxssh.c"
>
</File>
@@ -503,22 +475,6 @@
RelativePath="x11util.c"
>
</File>
- <File
- RelativePath="..\..\teraterm\common\codeconv.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\layer_for_unicode.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\compat_win.cpp"
- >
- </File>
- <File
- RelativePath="..\..\teraterm\common\dllutil.cpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"