[Winmerge-svn] SF.net SVN: winmerge:[7615] trunk/Src

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

Revision: 7615
          http://sourceforge.net/p/winmerge/code/7615
Author:   gerundt
Date:     2013-03-27 18:41:57 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Remove MFC dependency

Modified Paths:
--------------
    trunk/Src/Common/PidlContainer.cpp
    trunk/Src/DiffFileInfo.cpp
    trunk/Src/Merge.vcproj
    trunk/Src/MergeX64.vcproj

Modified: trunk/Src/Common/PidlContainer.cpp
===================================================================
--- trunk/Src/Common/PidlContainer.cpp	2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/Common/PidlContainer.cpp	2013-03-27 18:41:57 UTC (rev 7615)
@@ -26,18 +26,11 @@
 // Revision ID line follows -- this is updated by SVN
 // $Id$
 
-#include "StdAfx.h"
 #include "PidlContainer.h"
 
 #include <ShlObj.h>
 #include <comdef.h>
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
 CPidlContainer::~CPidlContainer()
 {
 	IMallocPtr m_pMalloc;

Modified: trunk/Src/DiffFileInfo.cpp
===================================================================
--- trunk/Src/DiffFileInfo.cpp	2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/DiffFileInfo.cpp	2013-03-27 18:41:57 UTC (rev 7615)
@@ -22,11 +22,11 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include <windows.h>
+#include <tchar.h>
+
 #include "DirItem.h"
 #include "DiffFileInfo.h"
-#include "unicoder.h"
-#include "UnicodeString.h"
 
 /**
  * @brief Convert file flags to string presentation.

Modified: trunk/Src/Merge.vcproj
===================================================================
--- trunk/Src/Merge.vcproj	2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/Merge.vcproj	2013-03-27 18:41:57 UTC (rev 7615)
@@ -819,6 +819,7 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -829,6 +830,7 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
@@ -2765,6 +2767,29 @@
 			<File
 				RelativePath="Common\PidlContainer.cpp"
 				>
+				<FileConfiguration
+					Name="UnicodeRelease|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="UnicodeDebug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="PluginManager.cpp"

Modified: trunk/Src/MergeX64.vcproj
===================================================================
--- trunk/Src/MergeX64.vcproj	2013-03-24 10:06:01 UTC (rev 7614)
+++ trunk/Src/MergeX64.vcproj	2013-03-27 18:41:57 UTC (rev 7615)
@@ -1460,6 +1460,7 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1470,6 +1471,7 @@
 						Optimization="1"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1480,6 +1482,7 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
@@ -1491,6 +1494,7 @@
 						Optimization="0"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
 						BrowseInformation="1"
 					/>
 				</FileConfiguration>
@@ -4898,6 +4902,52 @@
 			<File
 				RelativePath=".\Common\PidlContainer.cpp"
 				>
+				<FileConfiguration
+					Name="UnicodeRelease|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="UnicodeRelease|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="UnicodeDebug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="UnicodeDebug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="PluginManager.cpp"

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