OSDN > 브라 우즈 소프트웨어 > System > Storage > File Management > WinMerge Japanese > SCM > git > winmerge-jp > Commit

WinMerge Japanese
Fork

winmerge-jp: Commit

Remove atl100.dll dependency from WinMerge32BitPluginProxy.exe

Binary files a/Plugins/WinMerge32BitPluginProxy/WinMerge32BitPluginProxy.rc and b/Plugins/WinMerge32BitPluginProxy/WinMerge32BitPluginProxy.rc differ

--- a/Plugins/WinMerge32BitPluginProxy/WinMerge32BitPluginProxy.vcxproj

+++ b/Plugins/WinMerge32BitPluginProxy/WinMerge32BitPluginProxy.vcxproj

		@@ -24,7 +24,7 @@
24	24	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'" Label="Configuration">
25	25	<ConfigurationType>Application</ConfigurationType>
26	26	<UseDebugLibraries>false</UseDebugLibraries>
27		- <UseOfAtl>Dynamic</UseOfAtl>
	27	+ <UseOfAtl>Static</UseOfAtl>
28	28	<CharacterSet>Unicode</CharacterSet>
29	29	</PropertyGroup>
30	30	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

		@@ -87,6 +87,7 @@
87	87	<Optimization>MaxSpeed</Optimization>
88	88	<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89	89	<AdditionalIncludeDirectories>..\..\Src\Common</AdditionalIncludeDirectories>
	90	+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
90	91	</ClCompile>
91	92	<Midl>
92	93	<MkTypLibCompatible>false</MkTypLibCompatible>

		@@ -164,4 +165,4 @@
164	165	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
165	166	<ImportGroup Label="ExtensionTargets">
166	167	</ImportGroup>
167		-</Project>
	168	+</Project>
		\ No newline at end of file