From ea1a289ba4a243b1c631cc919a5c3d39c7415755 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 20 Nov 2011 21:15:55 +0100
Subject: [PATCH] fix build of debug x64 configuration

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 ext/build/libapr.vcproj                | 1 -
 ext/build/libaprutil.vcproj            | 1 -
 src/TortoiseMerge/TortoiseMerge.vcproj | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ext/build/libapr.vcproj b/ext/build/libapr.vcproj
index f91a59122..c2738489e 100644
--- a/ext/build/libapr.vcproj
+++ b/ext/build/libapr.vcproj
@@ -373,7 +373,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:X86"
 				AdditionalDependencies="ws2_32.lib mswsock.lib rpcrt4.lib"
 				OutputFile="$(OutDir)\libapr_tsvn.dll"
 				LinkIncremental="1"
diff --git a/ext/build/libaprutil.vcproj b/ext/build/libaprutil.vcproj
index 46961c2f0..b8f51127e 100644
--- a/ext/build/libaprutil.vcproj
+++ b/ext/build/libaprutil.vcproj
@@ -277,7 +277,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:X86"
 				AdditionalDependencies="ws2_32.lib mswsock.lib"
 				OutputFile="$(OutDir)\libaprutil_tsvn.dll"
 				LinkIncremental="1"
diff --git a/src/TortoiseMerge/TortoiseMerge.vcproj b/src/TortoiseMerge/TortoiseMerge.vcproj
index 490dd546f..0f55379f2 100644
--- a/src/TortoiseMerge/TortoiseMerge.vcproj
+++ b/src/TortoiseMerge/TortoiseMerge.vcproj
@@ -131,7 +131,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\gitdll;..\..\ext\apr\include;&quot;..\..\ext\apr-util\include&quot;;..\..\ext\SubVersion\subversion\include;..\..\ext\SubVersion\subversion\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"
+				AdditionalIncludeDirectories="..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;&quot;..\..\ext\apr-util\include&quot;;..\..\ext\SubVersion\subversion\include;.\libsvn_diff;..\Utils;..\Utils\NewMenu;..\Utils\ColourPickerXP;..\TortoiseMerge;..\crashrpt;..\;..\SVN;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -156,7 +156,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\debug_x64\libsvn_diff-nonet.lib ../../ext/Subversion\debug_x64\libsvn_subr-nonet.lib ../../ext/Subversion\debug_x64\libsvn_client-nonet.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/Subversion\debug_x64\libsvn_wc-nonet.lib ../../ext/Subversion\debug_x64\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib"
+				AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../bin/release64/bin/libapr_tsvn.lib ../../bin/release64/bin/libaprutil_tsvn.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../bin/release64/bin/xml.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-- 
2.11.4.GIT