OSDN Git Service

Enable 64bit build again
authorFrank Li <lznuaa@gmail.com>
Wed, 11 Feb 2009 05:08:48 +0000 (13:08 +0800)
committerFrank Li <lznuaa@gmail.com>
Wed, 11 Feb 2009 05:08:48 +0000 (13:08 +0800)
Languages/TortoiseLang.vcproj
src/TGitCache/TSVNCache.vcproj
src/TortoiseGit.sln
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseShell/TortoiseShell.vcproj

index d7affeb..3a87a3e 100644 (file)
@@ -12,6 +12,9 @@
                <Platform\r
                        Name="Win32"\r
                />\r
+               <Platform\r
+                       Name="x64"\r
+               />\r
        </Platforms>\r
        <ToolFiles>\r
        </ToolFiles>\r
                                CompileAsManaged=""\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               CleanCommandLine="nmake /f Makefile clean "\r
+                               Output=""\r
+                               PreprocessorDefinitions="WIN32;_DEBUG"\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|x64"\r
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       ConfigurationType="0"\r
+                       >\r
+                       <Tool\r
+                               Name="VCNMakeTool"\r
+                               BuildCommandLine="adfad"\r
+                               ReBuildCommandLine=""\r
+                               CleanCommandLine=""\r
+                               Output="TortoiseLangs.exe"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG"\r
+                               IncludeSearchPath=""\r
+                               ForcedIncludes=""\r
+                               AssemblySearchPath=""\r
+                               ForcedUsingAssemblies=""\r
+                               CompileAsManaged=""\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
index 8859989..08dc76a 100644 (file)
                                Name="VCLinkerTool"\r
                                IgnoreImportLibrary="true"\r
                                UseLibraryDependencyInputs="true"\r
-                               AdditionalDependencies="Crypt32.lib wingit.lib"\r
+                               AdditionalDependencies="Crypt32.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="../../ext/wingit"\r
                                IgnoreDefaultLibraryNames="libc"\r
-                               DelayLoadDLLs="wingit.dll"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TGitCache.pdb"\r
                                SubSystem="2"\r
index 717f859..9334049 100644 (file)
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual C++ Express 2008\r
+# Visual Studio 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProc", "TortoiseProc\TortoiseProc.vcproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}"\r
@@ -124,7 +124,8 @@ Global
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.Build.0 = Release|x64\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x86.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -201,7 +202,8 @@ Global
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.Build.0 = Release|x64\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x86.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -443,6 +445,7 @@ Global
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.Build.0 = Release|x64\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x86.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -467,7 +470,8 @@ Global
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|Win32\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.Build.0 = Release|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x86.ActiveCfg = Release|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Mixed Platforms.ActiveCfg = debug_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Mixed Platforms.Build.0 = debug_static|Win32\r
@@ -491,7 +495,8 @@ Global
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Win32.ActiveCfg = Release|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|Win32.Build.0 = Release|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.ActiveCfg = Release|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.ActiveCfg = Release|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x64.Build.0 = Release|x64\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Release|x86.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -515,7 +520,8 @@ Global
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.Build.0 = Release|Win32\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|Win32\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|x64\r
+               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.Build.0 = Release|x64\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x86.ActiveCfg = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
@@ -537,7 +543,8 @@ Global
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.ActiveCfg = Release|Win32\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.ActiveCfg = Release|Win32\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.ActiveCfg = Release|x64\r
+               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.Build.0 = Release|x64\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x86.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
index b4c6169..53df0ad 100644 (file)
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib wingit.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="../../ext/wingit"\r
                                IgnoreDefaultLibraryNames="LIBCMTD"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib wingit.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="../../ext/wingit"\r
-                               DelayLoadDLLs="wingit.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
index 6df471c..edce7c7 100644 (file)
@@ -75,7 +75,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib wingit.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="../../ext/wingit"\r
                                IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMTD;"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib wingit.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="../../ext/wingit"\r
                                IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
-                               DelayLoadDLLs="gdiplus.dll;wingit.dll"\r
+                               DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
index 7dfb43f..84edbd9 100644 (file)
@@ -92,7 +92,7 @@
                                IgnoreAllDefaultLibraries="false"\r
                                IgnoreDefaultLibraryNames="LIBC"\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
-                               DelayLoadDLLs="gdiplus.dll;wingit.dll"\r
+                               DelayLoadDLLs="gdiplus.dll;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TortoiseGit.pdb"\r
                                OptimizeReferences="1"\r
                                AdditionalLibraryDirectories="../../ext/wingit"\r
                                IgnoreDefaultLibraryNames="libcd, libc, shell32"\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
-                               DelayLoadDLLs="gdiplus.dll;wingit.dll"\r
+                               DelayLoadDLLs="gdiplus.dll;"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"\r
                                SubSystem="2"\r