Revision: 7524 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7524 Author: zmatsuo Date: 2019-03-29 01:09:45 +0900 (Fri, 29 Mar 2019) Log Message: ----------- プロジェクトファイル保守 VS2017 Modified Paths: -------------- trunk/teraterm/teraterm/ttermpro.v15.vcxproj trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj -------------- next part -------------- Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v15.vcxproj 2019-03-28 11:47:42 UTC (rev 7523) +++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj 2019-03-28 16:09:45 UTC (rev 7524) @@ -15,6 +15,7 @@ <RootNamespace>ttermpro</RootNamespace> <Keyword>MFCProj</Keyword> <ProjectName>ttermpro</ProjectName> + <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> @@ -64,7 +65,7 @@ <ClCompile> <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <BrowseInformation /> @@ -77,10 +78,10 @@ <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <Culture>0x0411</Culture> - <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>nafxcwd.lib;LIBCMTD.lib;onig_sd.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> @@ -87,11 +88,15 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries> </Link> <Manifest> <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> </Manifest> + <PreBuildEvent> + <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command> + <Message>creating "$(ProjectDir)svnversion.h"</Message> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <Midl> @@ -106,7 +111,7 @@ <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions> <Optimization>MaxSpeed</Optimization> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -122,7 +127,7 @@ <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ResourceCompile> <Link> - <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>nafxcw.lib;LIBCMT.lib;onig_s.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,6 +139,10 @@ <Manifest> <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles> </Manifest> + <PreBuildEvent> + <Message>creating "$(ProjectDir)svnversion.h"</Message> + <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\common\dlglib.c" /> @@ -175,9 +184,9 @@ <ClCompile Include="vtwin.cpp" /> <ClCompile Include="winjump.c" /> <ClCompile Include="WSAAsyncGetAddrInfo.c" /> - <ClCompile Include="../ttpdlg/dlg_res.h" /> + <ClInclude Include="../ttpdlg/dlg_res.h" /> <ClCompile Include="../ttpdlg/ttdlg.c" /> - <ClCompile Include="../ttpdlg/ttdlg.h" /> + <ClInclude Include="../ttpdlg/ttdlg.h" /> </ItemGroup> <ItemGroup> <Image Include="..\..\cygterm\cygterm.ico" /> @@ -237,6 +246,9 @@ <ClInclude Include="vtwin.h" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\svnrev\svnrev.v15.vcxproj"> + <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project> + </ProjectReference> <ProjectReference Include="..\ttpcmn\ttpcmn.v15.vcxproj"> <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2019-03-28 11:47:42 UTC (rev 7523) +++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj.filters 2019-03-28 16:09:45 UTC (rev 7524) @@ -19,6 +19,9 @@ <Filter Include="dialog"> <UniqueIdentifier>{23d7c62e-eff4-4a0d-b8b4-7fc703717c0e}</UniqueIdentifier> </Filter> + <Filter Include="ttpdlg"> + <UniqueIdentifier>{1cdaec4a-75c1-4600-b434-45286f5bec80}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="filesys.cpp"> @@ -120,6 +123,27 @@ <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> </ItemGroup> <ItemGroup> <Image Include="..\..\cygterm\cygterm.ico"> @@ -154,6 +178,9 @@ <ResourceCompile Include="ttermpro.rc"> <Filter>Resource Files</Filter> </ResourceCompile> + <ResourceCompile Include="../ttpdlg/ttpdlg.rc"> + <Filter>ttpdlg</Filter> + </ResourceCompile> </ItemGroup> <ItemGroup> <ClInclude Include="sizetip.h"> @@ -276,5 +303,11 @@ <ClInclude Include="..\common\win16api.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="../ttpdlg/dlg_res.h"> + <Filter>ttpdlg</Filter> + </ClInclude> + <ClInclude Include="../ttpdlg/ttdlg.h"> + <Filter>ttpdlg</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 11:47:42 UTC (rev 7523) +++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2019-03-28 16:09:45 UTC (rev 7524) @@ -125,7 +125,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <SubSystem>Windows</SubSystem> <TargetMachine>MachineX86</TargetMachine> - <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib</IgnoreSpecificDefaultLibraries> + <IgnoreSpecificDefaultLibraries>nafxcwd.lib;LIBCMTD.lib;libcmt.lib</IgnoreSpecificDefaultLibraries> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -199,4 +199,4 @@ <UserProperties RESOURCE_FILE="ttpmacro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> \ No newline at end of file +</Project>