X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTortoiseShell%2FTortoiseShell.vcproj;h=62ef7d365748e47304a7f9a5832eef9caa73d733;hb=9350b24ea691218cab69a7ac053a972cf0678e7d;hp=6d728867cd402c9b81d2501c8ee6058570f26643;hpb=494a73c5e5b662fada8f48ad88b7c2a554bebce1;p=tortoisegit%2FTortoiseGitJp.git

diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index 6d72886..62ef7d3 100644
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="TortoiseShell"
 	ProjectGUID="{E873DD32-5A31-4DE1-8341-A56A2A5489EA}"
 	RootNamespace="TortoiseShell"
@@ -24,7 +24,7 @@
 			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfATL="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
@@ -52,8 +52,8 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				InlineFunctionExpansion="0"
-				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI;../../ext/wingit"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"
+				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG;_TORTOISESHELL"
 				BasicRuntimeChecks="1"
 				RuntimeLibrary="3"
 				ForceConformanceInForLoopScope="true"
@@ -82,15 +82,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				UseLibraryDependencyInputs="false"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				OutputFile="$(OutDir)/TortoiseGit.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../ext/wingit"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBC"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
@@ -127,15 +125,14 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
-			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
+			Name="Debug|x64"
+			OutputDirectory="..\..\bin\Debug64\bin"
+			IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfATL="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -151,39 +148,38 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/TortoiseShell.tlb"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug/TortoiseShell.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI;../../ext/wingit"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
+				Optimization="0"
+				InlineFunctionExpansion="0"
+				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
+				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"
+				BasicRuntimeChecks="1"
+				RuntimeLibrary="3"
 				ForceConformanceInForLoopScope="true"
+				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				AssemblerListingLocation="..\..\obj\TortoiseShell\Release/"
-				ObjectFile="..\..\obj\TortoiseShell\Release/"
-				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Release/"
+				AssemblerListingLocation="..\..\obj\TortoiseShell\Debug64/"
+				ObjectFile="..\..\obj\TortoiseShell\Debug64/"
+				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Debug64/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
 				CompileAs="0"
+				DisableSpecificWarnings="4996,4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;TSVNSHELL"
+				PreprocessorDefinitions="_DEBUG;TSVNSHELL"
 				Culture="1033"
 			/>
 			<Tool
@@ -192,26 +188,21 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib wingit.lib"
-				OutputFile="$(OutDir)/TortoiseGit.dll"
-				LinkIncremental="1"
+				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
+				OutputFile="$(OutDir)/TortoiseSVN.dll"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="../../ext/wingit"
-				IgnoreDefaultLibraryNames="libcd, libc, shell32"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				ProgramDatabaseFile="$(OutDir)/TortoiseSVN.pdb"
 				BaseAddress="0x5960000"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="..\..\obj\TortoiseShell\Release/TortoiseSVN.lib"
-				TargetMachine="1"
+				ImportLibrary="..\..\obj\TortoiseShell\Debug64/TortoiseSVN.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -236,14 +227,15 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\bin\Debug64\bin"
-			IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfATL="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -259,38 +251,35 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/TortoiseShell.tlb"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/TortoiseShell.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="0"
 				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
-				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"
-				BasicRuntimeChecks="1"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TORTOISESHELL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
 				ForceConformanceInForLoopScope="true"
-				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
-				AssemblerListingLocation="..\..\obj\TortoiseShell\Debug64/"
-				ObjectFile="..\..\obj\TortoiseShell\Debug64/"
-				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Debug64/"
+				AssemblerListingLocation="..\..\obj\TortoiseShell\Release/"
+				ObjectFile="..\..\obj\TortoiseShell\Release/"
+				ProgramDataBaseFileName="..\..\obj\TortoiseShell\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
 				CompileAs="0"
-				DisableSpecificWarnings="4996,4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG;TSVNSHELL"
+				PreprocessorDefinitions="NDEBUG;TSVNSHELL"
 				Culture="1033"
 			/>
 			<Tool
@@ -299,21 +288,26 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
+				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
-				OutputFile="$(OutDir)/TortoiseSVN.dll"
-				LinkIncremental="0"
+				OutputFile="$(OutDir)/TortoiseGit.dll"
+				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBC"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/TortoiseSVN.pdb"
+				ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="0"
 				BaseAddress="0x5960000"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="..\..\obj\TortoiseShell\Debug64/TortoiseSVN.lib"
-				TargetMachine="17"
+				ImportLibrary="..\..\obj\TortoiseShell\Release/TortoiseSVN.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -343,7 +337,7 @@
 			IntermediateDirectory="..\..\obj\TortoiseShell\Release64"
 			ConfigurationType="2"
 			UseOfMFC="0"
-			UseOfATL="1"
+			UseOfATL="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
@@ -370,10 +364,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
 				AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="true"
@@ -407,7 +397,7 @@
 				OutputFile="$(OutDir)/TortoiseGit.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libcd, libc, shell32"
+				IgnoreDefaultLibraryNames=""
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
@@ -453,6 +443,10 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
+				RelativePath="..\TGitCache\CacheInterface.cpp"
+				>
+			</File>
+			<File
 				RelativePath="ColumnProvider.cpp"
 				>
 			</File>
@@ -473,6 +467,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Git\GitIndex.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\Git\GitRev.cpp"
 				>
 			</File>
@@ -505,6 +503,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\RemoteCacheLink.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\ShellExt.cpp"
 				>
 			</File>
@@ -528,7 +530,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -536,7 +538,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -659,6 +661,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\icon2.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menuabout.ico"
 				>
 			</File>
@@ -679,6 +685,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menucombine.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menucommit.ico"
 				>
 			</File>
@@ -711,6 +721,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menuedit.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menuexport.ico"
 				>
 			</File>
@@ -743,10 +757,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menupick.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menuproperties.ico"
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menurebase.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menurelocate.ico"
 				>
 			</File>
@@ -771,6 +793,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menusendmail.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menusettings.ico"
 				>
 			</File>
@@ -779,10 +805,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menuskip.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\Resources\menusquash.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menuswitch.ico"
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\menusync.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\menuunlock.ico"
 				>
 			</File>
@@ -795,6 +833,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\Push.ico"
+				>
+			</File>
+			<File
 				RelativePath=".\resourceshell.rc"
 				>
 			</File>
@@ -803,6 +845,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\tag.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\Tortoise.ico"
 				>
 			</File>