merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseShell / TortoiseShell.vcproj

diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index f013e00..7a3add3 100644 (file)
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -23,8 +23,8 @@
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
-                       UseOfMFC="2"\r
-                       UseOfATL="0"\r
+                       UseOfMFC="0"\r
+                       UseOfATL="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        >\r
@@ -52,7 +52,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                InlineFunctionExpansion="0"\r
-                               AdditionalIncludeDirectories=""../Git";"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="../../ext/gitdll;../Git;"../../ext/apr-util/include";"../../ext/apr-util/xml/expat/lib";../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;"..\..\ext\libintl\libintl3-win32\inc";..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG;_TORTOISESHELL"\r
                                BasicRuntimeChecks="1"\r
                                RuntimeLibrary="3"\r
@@ -82,14 +82,12 @@
                        <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=""\r
-                               IgnoreAllDefaultLibraries="false"\r
                                IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
@@ -131,8 +129,8 @@
                        OutputDirectory="..\..\bin\Debug64\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"\r
                        ConfigurationType="2"\r
-                       UseOfMFC="2"\r
-                       UseOfATL="0"\r
+                       UseOfMFC="0"\r
+                       UseOfATL="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        >\r
@@ -160,7 +158,7 @@
                                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
+                               AdditionalIncludeDirectories="../../ext/gitdll;../Git;&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
@@ -234,7 +232,7 @@
                        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
@@ -261,10 +259,10 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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
+                               AdditionalIncludeDirectories="../../ext/gitdll;../Git;&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;_TORTOISESHELL"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
@@ -339,7 +337,7 @@
                        IntermediateDirectory="..\..\obj\TortoiseShell\Release64"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
-                       UseOfATL="0"\r
+                       UseOfATL="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
@@ -366,10 +364,10 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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
+                               AdditionalIncludeDirectories="../../ext/gitdll;../Git;&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
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
@@ -489,6 +487,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\MenuInfo.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Utils\PathUtils.cpp"\r
                                >\r
                        </File>\r
@@ -557,6 +559,10 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
+                               RelativePath=".\SVNPropertyPage.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Git\TGitPath.cpp"\r
                                >\r
                        </File>\r
@@ -663,6 +669,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\icon2.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\menuabout.ico"\r
                                >\r
                        </File>\r
@@ -719,6 +729,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\menuedit.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\menuexport.ico"\r
                                >\r
                        </File>\r
@@ -751,6 +765,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\menupick.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\menuproperties.ico"\r
                                >\r
                        </File>\r
@@ -783,6 +801,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\menusendmail.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\menusettings.ico"\r
                                >\r
                        </File>\r
@@ -791,10 +813,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
@@ -807,6 +841,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\Push.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\resourceshell.rc"\r
                                >\r
                        </File>\r
@@ -815,6 +853,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\Resources\tag.ico"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\Resources\Tortoise.ico"\r
                                >\r
                        </File>\r