Fix 64 create MSI problem because TGitCache.exe using TSVNCache.exe name.

[tortoisegit/TortoiseGitJp.git] / src / TGitCache / TSVNCache.vcproj

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index c1c4d98..b0a7b04 100644 (file)
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -107,13 +107,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\Bin\Debug64\Bin"\r
+                       IntermediateDirectory="..\..\obj\TGitCache\Debug64"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -129,19 +128,23 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
+                               PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               SmallerTypeCheck="true"\r
                                RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -154,19 +157,17 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="true"\r
                                AdditionalDependencies="Crypt32.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""\r
-                               DelayLoadDLLs=""\r
+                               LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames="LIBC"\r
                                GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -191,12 +192,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\Bin\Debug64\Bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -212,23 +214,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               InlineFunctionExpansion="2"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
-                               PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               SmallerTypeCheck="true"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
                                RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -241,17 +239,19 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="true"\r
                                AdditionalDependencies="Crypt32.lib"\r
-                               OutputFile="$(OutDir)/TSVNCache.exe"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               OutputFile="$(OutDir)/TGitCache.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               DelayLoadDLLs=""\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -278,7 +278,7 @@
                <Configuration\r
                        Name="Release|x64"\r
                        OutputDirectory="..\..\bin\Release64\bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\Release64"\r
+                       IntermediateDirectory="..\..\obj\TGitCache\Release64"\r
                        ConfigurationType="1"\r
                        UseOfATL="1"\r
                        CharacterSet="1"\r
@@ -325,7 +325,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib"\r
-                               OutputFile="$(OutDir)/TSVNCache.exe"\r
+                               OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -435,7 +435,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -443,7 +443,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r