[Winmerge-svn] SF.net SVN: winmerge:[7491] branches/R2_14/Src

[<ge...@us...>]

Revision: 7491
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7491&view=rev
Author:   gerundt
Date:     2010-12-31 13:37:55 +0000 (Fri, 31 Dec 2010)

Log Message:
-----------
Remove the MFC dependency from DirItem.cpp.

Modified Paths:
--------------
    branches/R2_14/Src/DirItem.cpp
    branches/R2_14/Src/Merge.vcproj
    branches/R2_14/Src/MergeX64.vcproj

Modified: branches/R2_14/Src/DirItem.cpp
===================================================================
--- branches/R2_14/Src/DirItem.cpp	2010-12-31 12:53:47 UTC (rev 7490)
+++ branches/R2_14/Src/DirItem.cpp	2010-12-31 13:37:55 UTC (rev 7491)
@@ -22,9 +22,10 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include <windows.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <tchar.h>
 #include "UnicodeString.h"
 #include "coretools.h"
 #include "DirItem.h"

Modified: branches/R2_14/Src/Merge.vcproj
===================================================================
--- branches/R2_14/Src/Merge.vcproj	2010-12-31 12:53:47 UTC (rev 7490)
+++ branches/R2_14/Src/Merge.vcproj	2010-12-31 13:37:55 UTC (rev 7491)
@@ -1227,6 +1227,9 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1237,6 +1240,9 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
+						PrecompiledHeaderFile=""
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>

Modified: branches/R2_14/Src/MergeX64.vcproj
===================================================================
--- branches/R2_14/Src/MergeX64.vcproj	2010-12-31 12:53:47 UTC (rev 7490)
+++ branches/R2_14/Src/MergeX64.vcproj	2010-12-31 13:37:55 UTC (rev 7491)
@@ -2174,6 +2174,7 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -2184,6 +2185,8 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -2194,6 +2197,7 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
@@ -2205,6 +2209,8 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						PrecompiledHeaderThrough=""
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>


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