Fix X64 Build Problem

diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp
index 018f272..cb3d369 100644 (file)
--- a/src/Git/TGitPath.cpp
+++ b/src/Git/TGitPath.cpp
@@ -28,6 +28,9 @@
 //#include "AppUtils.h"\r
 #endif\r
 \r
+#ifndef ASSERT\r
+#define ASSERT()\r
+#endif\r
 using namespace std;\r
 extern CGit g_Git;\r
 \r

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
index a6fe7ae..347927c 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory=""\r
-                               CommandArguments="D:\Profiles\b20596\git\alloc.c /rev:2c1cbe"\r
+                               CommandArguments=""\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r
@@ -22,7 +22,7 @@
                                SQLDebugging=""\r
                                Environment=""\r
                                EnvironmentMerge="true"\r
-                               DebuggerFlavor="0"\r
+                               DebuggerFlavor=""\r
                                MPIRunCommand=""\r
                                MPIRunArguments=""\r
                                MPIRunWorkingDirectory=""\r
@@ -34,7 +34,7 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        >\r
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
@@ -62,7 +62,7 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Release|Win32"\r
                        >\r
                        <DebugSettings\r
                                Command="$(TargetPath)"\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index c2f3d52..73a2bb7 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:commit /path:&quot;D:\\test4\\tt&quot;"\r
+                               CommandArguments="/command:log /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r