From 1a31985ade3cb352712525d8dd8187ecaecb300d Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Mon, 19 Feb 2007 22:32:17 +0000
Subject: [PATCH] Add short instructions for Visual Studio 2005

---
 Docs/Developers/Changes.txt            |  2 ++
 Docs/Developers/readme-developers.html | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Docs/Developers/Changes.txt b/Docs/Developers/Changes.txt
index edef540cf..b7a9a2d3e 100644
--- a/Docs/Developers/Changes.txt
+++ b/Docs/Developers/Changes.txt
@@ -1,6 +1,8 @@
 2007-02-19 Kimmo
  Bugs 1663767-1663770, 1663776, 1663778: typo/grammar fixes.
   Developers: readme-developers.html
+ Add short instructions for Visual Studio 2005
+  Developers: readme-developers.html
 
 2007-02-12 Tim
  PATCH: [ 1658347 ] Add note about PSDK paths and VC into dev-readme
diff --git a/Docs/Developers/readme-developers.html b/Docs/Developers/readme-developers.html
index 743e1c59b..9d429af61 100644
--- a/Docs/Developers/readme-developers.html
+++ b/Docs/Developers/readme-developers.html
@@ -191,6 +191,18 @@ for compiling releases are:<br>
   <li>Plugin dlls : Unicode Release MinDependency</li>
 </ul>
 
+<h4>Visual Studio 2005</h4>
+<p>When VC6 project file (.dsp) is converted to Visual Studio 2005 project, it does not
+compile correctly as is. The problem is Visual Studio 2005 automatically generates and
+embeds manifest file for the executable. And as WinMerge resource file includes manifest
+file there are conflicts.</p>
+
+<p>The easiest way to fix the compile is to disable VS2005 from creating and embedding
+the manifest file. From project properties:
+<ul>
+  <li>disable Linker / Manifest File / Generate Manifest (set to "No")</li>
+  <li>disable Manifest Tool / Input and Output/ Embed Manifest (set to "No")
+</ul></p>
 
 <h3><a name="Code_changes">Code changes</a></h3>
 
-- 
2.11.0