From 4b68b59d15aac1ccdd34063a227cd7809de27bd2 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Mon, 8 Jun 2009 11:49:43 +0800
Subject: [PATCH] Fix Issue #89: Can't locate msysgit on x64

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Git/Git.vcproj  | 4 ++--
 src/Git/GitConfig.h | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index 8a83b53ec..d50aa4edc 100644
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -113,7 +113,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../utils"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -241,7 +241,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../utils"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
diff --git a/src/Git/GitConfig.h b/src/Git/GitConfig.h
index 9abfd5471..1892e5586 100644
--- a/src/Git/GitConfig.h
+++ b/src/Git/GitConfig.h
@@ -8,4 +8,9 @@ public:
 };
 
 #define REG_MSYSGIT_PATH _T("Software\\TortoiseGit\\MSysGit")
-#define REG_MSYSGIT_INSTALL _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation")
\ No newline at end of file
+
+#ifndef WIN64
+#define REG_MSYSGIT_INSTALL _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation")
+#else
+#define REG_MSYSGIT_INSTALL	_T("SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation")
+#endif
\ No newline at end of file
-- 
2.11.4.GIT