OSDN Git Service

Fixed CRT linkage options.
authorjackie <kjackie@gmail.com>
Thu, 26 Feb 2009 06:15:03 +0000 (14:15 +0800)
committerFrank Li <lznuaa@gmail.com>
Sun, 1 Mar 2009 13:18:07 +0000 (21:18 +0800)
Fixed x64 verson of TortoiseProc crash.

ext/hunspell/hunspell.vcproj
ext/scintilla/vcbuild/SciLexer.vcproj
src/ResText/ResText.vcproj
src/TGitCache/TSVNCache.vcproj
src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
src/TortoiseProc/LogDlg.cpp
src/TortoiseUDiff/TortoiseUDiff.vcproj

index 7565cdb..9e0c07a 100644 (file)
                                PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
                                PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
index f098831..6de1ebb 100644 (file)
@@ -56,7 +56,7 @@
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/SciLexer.pch"\r
                                BrowseInformation="1"\r
                                WarningLevel="4"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/SciLexer.pch"\r
                                BrowseInformation="1"\r
                                WarningLevel="4"\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="ReadMe.txt"\r
+                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
+                       RelativePath="ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r
index 50c8b55..36e63c5 100644 (file)
@@ -47,7 +47,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
index ff44b0d..2355772 100644 (file)
@@ -51,7 +51,7 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                SmallerTypeCheck="true"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                SmallerTypeCheck="true"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
index 188211a..1b81952 100644 (file)
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"\r
                                AssemblerListingLocation=""\r
                                ObjectFile="$(IntDir)\"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"\r
                                AssemblerListingLocation=""\r
                                ObjectFile="$(IntDir)\"\r
index cc09e5e..ea58f83 100644 (file)
@@ -2147,6 +2147,9 @@ void CLogDlg::SetSplitterRange()
 \r
 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)\r
 {\r
+       // FIXME: x64 version would get this function called with unexpected parameters.\r
+       if (!lParam)\r
+               return 0;\r
        RECT * rect = (LPRECT)lParam;\r
        CPoint point;\r
        CString temp;\r
index 910d186..fa80b31 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseUDiff\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\Debug64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseUDiff\Debug64"\r
                        ConfigurationType="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="2"\r
+                               PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\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
+                               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\TortoiseUDiff\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseUDiff\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
-                               PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\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
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\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