Remove MFC dependency from FileVersion(.cpp).

diff --git a/Src/FileVersion.cpp b/Src/FileVersion.cpp
index bc740af..6fceb3f 100644 (file)
--- a/Src/FileVersion.cpp
+++ b/Src/FileVersion.cpp
@@ -6,7 +6,9 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include <windows.h>
+#include <tchar.h>
+#include "coretypes.h"
 #include "UnicodeString.h"
 #include "FileVersion.h"
 

diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj
index 8e2f7bc..28f494b 100644 (file)
--- a/Src/Merge.vcproj
+++ b/Src/Merge.vcproj
@@ -2498,7 +2498,10 @@
                                                Name="VCCLCompilerTool"
                                                Optimization="1"
                                                AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
+                                               PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""/>
                                </FileConfiguration>
                                <FileConfiguration
                                        Name="UnicodeDebug|Win32">
@@ -2507,6 +2510,9 @@
                                                Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                                <FileConfiguration
@@ -2516,6 +2522,9 @@
                                                Optimization="0"
                                                AdditionalIncludeDirectories=""
                                                PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""
                                                BrowseInformation="1"/>
                                </FileConfiguration>
                                <FileConfiguration
@@ -2524,7 +2533,10 @@
                                                Name="VCCLCompilerTool"
                                                Optimization="1"
                                                AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""/>
+                                               PreprocessorDefinitions=""
+                                               UsePrecompiledHeader="0"
+                                               PrecompiledHeaderThrough=""
+                                               PrecompiledHeaderFile=""/>
                                </FileConfiguration>
                        </File>
                        <File