Revision: 8495 https://osdn.net/projects/ttssh2/scm/svn/commits/8495 Author: zmatsuo Date: 2020-01-22 22:53:33 +0900 (Wed, 22 Jan 2020) Log Message: ----------- common_static を ttermpro からリンク Modified Paths: -------------- trunk/teraterm/teraterm/CMakeLists.txt trunk/teraterm/teraterm/ttermpro.v16.vcxproj trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters trunk/teraterm/ttermpro.sln -------------- next part -------------- Modified: trunk/teraterm/teraterm/CMakeLists.txt =================================================================== --- trunk/teraterm/teraterm/CMakeLists.txt 2020-01-22 13:53:23 UTC (rev 8494) +++ trunk/teraterm/teraterm/CMakeLists.txt 2020-01-22 13:53:33 UTC (rev 8495) @@ -218,6 +218,7 @@ target_link_libraries( teraterm + common_static ttpcmn ttpfile ttpset @@ -227,6 +228,7 @@ # gdi32 comctl32 + comctl32 ws2_32 imagehlp delayimp Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj =================================================================== --- trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2020-01-22 13:53:23 UTC (rev 8494) +++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2020-01-22 13:53:33 UTC (rev 8495) @@ -264,6 +264,9 @@ <ClInclude Include="unicode.h" /> </ItemGroup> <ItemGroup> + <ProjectReference Include="..\common\common_static.v16.vcxproj"> + <Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project> + </ProjectReference> <ProjectReference Include="..\svnrev\svnrev.v16.vcxproj"> <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project> </ProjectReference> @@ -296,4 +299,4 @@ <UserProperties RESOURCE_FILE="ttermpro.rc" /> </VisualStudio> </ProjectExtensions> -</Project> +</Project> \ No newline at end of file Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters =================================================================== --- trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters 2020-01-22 13:53:23 UTC (rev 8494) +++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj.filters 2020-01-22 13:53:33 UTC (rev 8495) @@ -205,6 +205,12 @@ <ResourceCompile Include="../ttpdlg/ttpdlg.rc"> <Filter>ttpdlg</Filter> </ResourceCompile> + <ResourceCompile Include="debug_pp.rc"> + <Filter>Source Files</Filter> + </ResourceCompile> + <ResourceCompile Include="teraterm_manifest.rc"> + <Filter>Source Files</Filter> + </ResourceCompile> </ItemGroup> <ItemGroup> <ClInclude Include="sizetip.h"> @@ -364,4 +370,4 @@ <Filter>dialog</Filter> </ClInclude> </ItemGroup> -</Project> +</Project> \ No newline at end of file Modified: trunk/teraterm/ttermpro.sln =================================================================== --- trunk/teraterm/ttermpro.sln 2020-01-22 13:53:23 UTC (rev 8494) +++ trunk/teraterm/ttermpro.sln 2020-01-22 13:53:33 UTC (rev 8495) @@ -2,6 +2,7 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}" ProjectSection(ProjectDependencies) = postProject + {DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32} {BA519362-A2C2-4B1A-905B-F00791F9038A} = {BA519362-A2C2-4B1A-905B-F00791F9038A} {5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD} {6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}