From 3b3b7c88419ce05bbb0e4a5b244c158be03e4ae1 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 25 Jan 2009 20:50:42 +0000 Subject: [PATCH] Remove MFC dependency from DiffItem. --- Src/DiffItem.cpp | 8 +------- Src/Merge.vcproj | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Src/DiffItem.cpp b/Src/DiffItem.cpp index 99bd014fd..d0a746280 100644 --- a/Src/DiffItem.cpp +++ b/Src/DiffItem.cpp @@ -6,16 +6,10 @@ // ID line follows -- this is updated by SVN // $Id$ -#include "stdafx.h" +#include #include "DiffItem.h" #include "paths.h" -#ifdef _DEBUG -#undef THIS_FILE -static char THIS_FILE[]=__FILE__; -#define new DEBUG_NEW -#endif - DIFFITEM DIFFITEM::emptyitem; /** @brief DIFFITEM's destructor */ diff --git a/Src/Merge.vcproj b/Src/Merge.vcproj index 817a010c5..7248aafa0 100644 --- a/Src/Merge.vcproj +++ b/Src/Merge.vcproj @@ -1240,7 +1240,10 @@ Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="" - PreprocessorDefinitions=""/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/> @@ -1249,6 +1252,9 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile="" BrowseInformation="1"/> + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + PrecompiledHeaderThrough="" + PrecompiledHeaderFile=""/>