OSDN Git Service

Tgit.exe support 64bit
authorFrank Li <lznuaa@gmail.com>
Fri, 15 Jan 2010 15:22:37 +0000 (23:22 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 15 Jan 2010 15:22:37 +0000 (23:22 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
ext/gitdll/gitdll.vcproj
ext/libcurl
ext/tgit
ext/zlib
src/TortoiseGit.sln
src/TortoiseMerge/TortoiseMerge.vcproj

index 74e5654..e210954 100644 (file)
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\zlib;"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS;WIN64"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
index fef22cd..a0b6cd2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit fef22cdde2f238182c80fb8aa9b5e86a0d0dd826
+Subproject commit a0b6cd277b831a0de965c26dd135bc7b2036c150
index 8fe4e29..82efe12 160000 (submodule)
--- a/ext/tgit
+++ b/ext/tgit
@@ -1 +1 @@
-Subproject commit 8fe4e297ad77be0d8a25483e830d9b1695bbd2d9
+Subproject commit 82efe1205d4ff3ee6986d8a52bb690ff94521033
index 38f92b4..0021f22 160000 (submodule)
--- a/ext/zlib
+++ b/ext/zlib
@@ -1 +1 @@
-Subproject commit 38f92b4cc122a3d44c88538ba06a136807c91821
+Subproject commit 0021f229e74c96c1f160429a94145a6830a1e2fc
index 7055cad..8cc5d43 100644 (file)
@@ -49,6 +49,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WixSetup", "TortoiseGitSetu
                {8ABB4F84-891A-4748-8507-F5494842173E} = {8ABB4F84-891A-4748-8507-F5494842173E}\r
                {4472028D-4ACF-474E-AA95-9B7E12B50F60} = {4472028D-4ACF-474E-AA95-9B7E12B50F60}\r
                {5C6B6A95-2053-4593-9617-C4F176736D5A} = {5C6B6A95-2053-4593-9617-C4F176736D5A}\r
+               {6D95829D-AE04-47A7-B66B-DC2F581DDF01} = {6D95829D-AE04-47A7-B66B-DC2F581DDF01}\r
                {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9} = {6BD19BAE-4041-4E85-B576-AAC9D54CAAB9}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
                {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE} = {AE6AAFBA-9992-452A-9EB8-DD69402A4ACE}\r
@@ -78,6 +79,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitBlame", "Tortois
                {13BC1836-2726-45C4-9249-5BA2BBBF8328} = {13BC1836-2726-45C4-9249-5BA2BBBF8328}\r
                {A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}\r
+               {4F0A55DE-DAFD-4A0B-A03D-2C14CB77E08F} = {4F0A55DE-DAFD-4A0B-A03D-2C14CB77E08F}\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}\r
        EndProjectSection\r
 EndProject\r
index 9836cfd..6f62554 100644 (file)
                                Name="VCCLCompilerTool"\r
                                Optimization="3"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="..\..\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"\r
+                               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"\r
                                PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="2"\r