[Ttssh2-commit] [8575] #pragma comment(lib,"library") を削除

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2020年 3月 7日 (土) 00:21:42 JST


Revision: 8575
          https://osdn.net/projects/ttssh2/scm/svn/commits/8575
Author:   zmatsuo
Date:     2020-03-07 00:21:41 +0900 (Sat, 07 Mar 2020)
Log Message:
-----------
#pragma comment(lib,"library") を削除

- gcc/clang で サポートされていない pragma
- VS2005,VS2019 プロジェクトファイルに lib を追加

Modified Paths:
--------------
    trunk/TTProxy/TTProxy.v16.vcxproj
    trunk/TTProxy/TTProxy.v16.vcxproj.filters
    trunk/TTProxy/TTProxy.vcproj
    trunk/TTProxy/YCL/include/YCL/FileVersion.h
    trunk/TTProxy/YCL/include/YCL/Window.h

-------------- next part --------------
Modified: trunk/TTProxy/TTProxy.v16.vcxproj
===================================================================
--- trunk/TTProxy/TTProxy.v16.vcxproj	2020-03-05 15:17:36 UTC (rev 8574)
+++ trunk/TTProxy/TTProxy.v16.vcxproj	2020-03-06 15:21:41 UTC (rev 8575)
@@ -84,7 +84,7 @@
       <Culture>0x0411</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>common_static.lib;ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;ttpcmn.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
@@ -125,7 +125,7 @@
       <Culture>0x0411</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>common_static.lib;ws2_32.lib;ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>common_static.lib;ws2_32.lib;ttpcmn.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\teraterm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>TTX.def</ModuleDefinitionFile>
@@ -144,10 +144,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="TTProxy.cpp" />
-    <ClCompile Include="YCL\include\YCL\libc.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc" />

Modified: trunk/TTProxy/TTProxy.v16.vcxproj.filters
===================================================================
--- trunk/TTProxy/TTProxy.v16.vcxproj.filters	2020-03-05 15:17:36 UTC (rev 8574)
+++ trunk/TTProxy/TTProxy.v16.vcxproj.filters	2020-03-06 15:21:41 UTC (rev 8575)
@@ -24,9 +24,6 @@
     <ClCompile Include="TTProxy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="YCL\include\YCL\libc.cpp">
-      <Filter>YCL</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TTProxy.rc">

Modified: trunk/TTProxy/TTProxy.vcproj
===================================================================
--- trunk/TTProxy/TTProxy.vcproj	2020-03-05 15:17:36 UTC (rev 8574)
+++ trunk/TTProxy/TTProxy.vcproj	2020-03-06 15:21:41 UTC (rev 8575)
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="common_static.lib ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
+				AdditionalDependencies="common_static.lib ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib user32.lib version.lib"
 				OutputFile="$(OutDir)\TTXProxy.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -170,7 +170,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="common_static.lib ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib"
+				AdditionalDependencies="common_static.lib ws2_32.lib ttpcmn.lib gdi32.lib comdlg32.lib shell32.lib ole32.lib user32.lib version.lib"
 				OutputFile="$(OutDir)\TTXProxy.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"

Modified: trunk/TTProxy/YCL/include/YCL/FileVersion.h
===================================================================
--- trunk/TTProxy/YCL/include/YCL/FileVersion.h	2020-03-05 15:17:36 UTC (rev 8574)
+++ trunk/TTProxy/YCL/include/YCL/FileVersion.h	2020-03-06 15:21:41 UTC (rev 8575)
@@ -9,8 +9,6 @@
 
 #include <YCL/common.h>
 
-#pragma comment(lib, "version.lib")
-
 namespace yebisuya {
 
 class FileVersion {

Modified: trunk/TTProxy/YCL/include/YCL/Window.h
===================================================================
--- trunk/TTProxy/YCL/include/YCL/Window.h	2020-03-05 15:17:36 UTC (rev 8574)
+++ trunk/TTProxy/YCL/include/YCL/Window.h	2020-03-06 15:21:41 UTC (rev 8575)
@@ -354,9 +354,6 @@
 	}
 };
 
-#if defined(_MSC_VER)
-#pragma comment(lib, "user32.lib")
-#endif
 }
 
 #endif//_YCL_WINDOWS_H_


Ttssh2-commit メーリングリストの案内
Back to archive index