[Winmerge-svn] SF.net SVN: winmerge: [5605] trunk/Plugins

[<ki...@us...>]

Revision: 5605
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5605&view=rev
Author:   kimmov
Date:     2008-07-11 03:15:29 -0700 (Fri, 11 Jul 2008)

Log Message:
-----------
PATCH: [ 1979321 ] Plugins: Show processing instructions in XML files
 Link to expat dll instead of static linking it.

Modified Paths:
--------------
    trunk/Plugins/dlls/DisplayXMLFiles.dll
    trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcproj

Modified: trunk/Plugins/dlls/DisplayXMLFiles.dll
===================================================================
(Binary files differ)

Modified: trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcproj
===================================================================
--- trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcproj	2008-07-11 10:00:38 UTC (rev 5604)
+++ trunk/Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.vcproj	2008-07-11 10:15:29 UTC (rev 5605)
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMapsMT.lib libexpatMT.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="libexpatMapsMT.lib libexpat.lib odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\Build\MergeUnicodeDebug\MergePlugins/DisplayXMLFiles.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMapsMT.lib libexpatMT.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="libexpatMapsMT.lib libexpat.lib odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\Build\MergeRelease\MergePlugins/DisplayXMLFiles.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -164,7 +164,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMapsMT.lib libexpatMT.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="libexpatMapsMT.lib libexpat.lib odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\Build\MergeDebug\MergePlugins/DisplayXMLFiles.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -228,7 +228,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMapsMT.lib libexpatMT.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="libexpatMapsMT.lib libexpat.lib odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\Build\MergeReleaseMinSize\MergePlugins/DisplayXMLFiles.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -291,7 +291,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMapsMT.lib libexpatMT.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="libexpatMapsMT.lib libexpat.lib odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\Build\MergeUnicodeRelease\MergePlugins/DisplayXMLFiles.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -354,7 +354,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libexpatMapsMT.lib libexpatMT.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies="libexpatMapsMT.lib libexpat.lib odbc32.lib odbccp32.lib"
 				OutputFile="..\..\..\Build\MergeUnicodeReleaseMinSize\MergePlugins/DisplayXMLFiles.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.