OSDN Git Service

Merge branch 'master' of git://repo.or.cz/TortoiseGit
authorjackie <kjackie@gmail.com>
Sat, 28 Feb 2009 14:06:28 +0000 (22:06 +0800)
committerjackie <kjackie@gmail.com>
Sat, 28 Feb 2009 14:06:28 +0000 (22:06 +0800)
1  2 
src/TortoiseProc/TortoiseProc.vcproj

@@@ -78,7 -78,7 +78,7 @@@
                                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=""\r
 -                              IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMTD;"\r
 +                              IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        />\r
                </Configuration>\r
                <Configuration\r
 -                      Name="Release|Win32"\r
 -                      OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
 -                      IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
 +                      Name="Debug|x64"\r
 +                      OutputDirectory="..\..\bin\Debug64\bin"\r
 +                      IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
 +                      UseOfATL="0"\r
                        CharacterSet="1"\r
 -                      WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
 -                              PreprocessorDefinitions="NDEBUG"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="false"\r
 +                              TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
 -                              Optimization="1"\r
 -                              InlineFunctionExpansion="1"\r
 -                              FavorSizeOrSpeed="2"\r
 +                              Optimization="0"\r
                                AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
 -                              PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
 -                              StringPooling="true"\r
 -                              MinimalRebuild="false"\r
 +                              PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
 +                              MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
 -                              RuntimeLibrary="2"\r
 -                              BufferSecurityCheck="false"\r
 +                              RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
 -                              DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
 -                              PreprocessorDefinitions="NDEBUG"\r
 +                              PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\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"\r
 -                              LinkIncremental="1"\r
 -                              AdditionalLibraryDirectories="../../ext/wingit"\r
 -                              IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
 +                              LinkIncremental="2"\r
 +                              IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
 -                              OptimizeReferences="2"\r
 -                              EnableCOMDATFolding="2"\r
 -                              OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
 -                              TargetMachine="1"\r
 -                              Profile="true"\r
 +                              TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
 -                      Name="Debug|x64"\r
 -                      OutputDirectory="..\..\bin\Debug64\bin"\r
 -                      IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"\r
 +                      Name="Release|Win32"\r
 +                      OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
 +                      IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
 -                      UseOfMFC="2"\r
 -                      UseOfATL="0"\r
 +                      UseOfMFC="1"\r
                        CharacterSet="1"\r
 +                      WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
 -                              PreprocessorDefinitions="_DEBUG"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="false"\r
 -                              TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
 -                              Optimization="0"\r
                                AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
 -                              PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
 -                              MinimalRebuild="true"\r
 +                              PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
 +                              StringPooling="true"\r
 +                              MinimalRebuild="false"\r
                                ExceptionHandling="2"\r
 -                              RuntimeLibrary="3"\r
 +                              RuntimeLibrary="0"\r
 +                              BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                RuntimeTypeInfo="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
 +                              DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
 -                              PreprocessorDefinitions="_DEBUG"\r
 +                              PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"\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"\r
 -                              LinkIncremental="2"\r
 -                              IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
 +                              LinkIncremental="1"\r
 +                              AdditionalLibraryDirectories="../../ext/wingit"\r
 +                              IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\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
 +                              Profile="true"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        OutputDirectory="..\..\bin\Release64\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseProc\Release64"\r
                        ConfigurationType="1"\r
 -                      UseOfMFC="2"\r
 +                      UseOfMFC="1"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
 -                              Optimization="1"\r
 -                              InlineFunctionExpansion="1"\r
 -                              FavorSizeOrSpeed="2"\r
                                AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="2"\r
 -                              RuntimeLibrary="2"\r
 +                              RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\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"\r
                                LinkIncremental="1"\r
 -                              IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
 +                              IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                        RelativePath=".\AppUtils.cpp"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\DeleteConflictDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\DeleteConflictDlg.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="UI"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
 -                              Name="Release|Win32"\r
 +                              Name="Debug|x64"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
 -                              Name="Debug|x64"\r
 +                              Name="Release|Win32"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r