OSDN Git Service

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