OSDN Git Service

Fix Issue #89: Can't locate msysgit on x64
authorFrank Li <lznuaa@gmail.com>
Mon, 8 Jun 2009 03:49:43 +0000 (11:49 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 8 Jun 2009 03:49:43 +0000 (11:49 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/Git.vcproj
src/Git/GitConfig.h

index 8a83b53..d50aa4e 100644 (file)
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               PreprocessorDefinitions="WIN64;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               PreprocessorDefinitions="WIN64;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
index 9abfd54..1892e55 100644 (file)
@@ -8,4 +8,9 @@ public:
 };\r
 \r
 #define REG_MSYSGIT_PATH _T("Software\\TortoiseGit\\MSysGit")\r
-#define REG_MSYSGIT_INSTALL _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation")
\ No newline at end of file
+\r
+#ifndef WIN64\r
+#define REG_MSYSGIT_INSTALL _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation")\r
+#else\r
+#define REG_MSYSGIT_INSTALL    _T("SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Git_is1\\InstallLocation")\r
+#endif
\ No newline at end of file