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)
34 files changed:
ext/ResizableLib/ResizableLib.vcproj
ext/hunspell/hunspell.vcproj
ext/scintilla/vcbuild/SciLexer.vcproj
src/Git/Git.vcproj
src/IBugTraqProvider/IBugTraqProvider.vcproj
src/ResText/ResText.vcproj
src/TGitCache/TSVNCache.vcproj
src/TortoiseGit.sln
src/TortoiseGitBlame/OutputWnd.cpp
src/TortoiseGitBlame/OutputWnd.h
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
src/TortoiseProc/AboutDlg.cpp
src/TortoiseProc/AboutDlg.h
src/TortoiseProc/BlameDlg.cpp
src/TortoiseProc/BlameDlg.h
src/TortoiseProc/LogDlg.cpp
src/TortoiseProc/Settings/SettingsPropPage.cpp
src/TortoiseProc/Settings/SettingsPropPage.h
src/TortoiseProc/Settings/SettingsRevisionGraph.cpp
src/TortoiseProc/Settings/SettingsRevisionGraph.h
src/TortoiseProc/Settings/SettingsTBlame.cpp
src/TortoiseProc/Settings/SettingsTBlame.h
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseShell/TortoiseShell.vcproj
src/TortoiseUDiff/TortoiseUDiff.vcproj
src/Utils/MiscUI/HintListCtrl.cpp
src/Utils/MiscUI/HintListCtrl.h
src/Utils/MiscUI/MenuButton.cpp
src/Utils/MiscUI/OddButton.cpp
src/Utils/MiscUI/OddButton.h
src/Utils/MiscUI/StandAloneDlg.cpp
src/Utils/Utils.vcproj
src/crashrpt/CrashRpt.vcproj

index d60a260..13f7fca 100644 (file)
@@ -24,7 +24,7 @@
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="2"\r
+                       UseOfMFC="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
@@ -51,7 +51,7 @@
                                FavorSizeOrSpeed="2"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="2"\r
+                       UseOfMFC="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                                FavorSizeOrSpeed="2"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
index 7565cdb..9ae2b63 100644 (file)
@@ -45,8 +45,6 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\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
                                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..a5a2a68 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
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\include,..\src"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                StringPooling="true"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\include,..\src"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                StringPooling="true"\r
index f438b99..52ecdc7 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="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="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
-                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="2"\r
-                       UseOfATL="1"\r
+                       UseOfMFC="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="../utils"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="2"\r
+                       UseOfMFC="1"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../utils"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\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
index bebd9e1..eb4cac9 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
index 50c8b55..69de2e6 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
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               FavorSizeOrSpeed="2"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               FavorSizeOrSpeed="2"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
index c1c4d98..c34fec5 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
@@ -76,7 +76,7 @@
                                OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories=""\r
-                               IgnoreDefaultLibraryNames="libc"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(OutDir)/TGitCache.pdb"\r
                                SubSystem="2"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\Bin\Debug64\Bin"\r
+                       IntermediateDirectory="..\..\obj\TSVNCache\Debug64"\r
                        ConfigurationType="1"\r
                        UseOfATL="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
-                               InlineFunctionExpansion="2"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               SmallerTypeCheck="true"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="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="VCLinkerTool"\r
+                               IgnoreImportLibrary="true"\r
                                AdditionalDependencies="Crypt32.lib"\r
                                OutputFile="$(OutDir)/TGitCache.exe"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""\r
-                               DelayLoadDLLs=""\r
+                               LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
+                               ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\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\TSVNCache\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
                        ConfigurationType="1"\r
                        UseOfATL="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="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
-                               PreprocessorDefinitions="WIN64;_DEBUG;_CONSOLE;UNICODE;_UNICODE"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               SmallerTypeCheck="true"\r
-                               RuntimeLibrary="2"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="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="VCLinkerTool"\r
-                               IgnoreImportLibrary="true"\r
                                AdditionalDependencies="Crypt32.lib"\r
-                               OutputFile="$(OutDir)/TSVNCache.exe"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               OutputFile="$(OutDir)/TGitCache.exe"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
+                               IgnoreDefaultLibraryNames=""\r
+                               DelayLoadDLLs=""\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/TSVNCache.pdb"\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
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="2"\r
                                AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"\r
                                PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib"\r
-                               OutputFile="$(OutDir)/TSVNCache.exe"\r
+                               OutputFile="$(OutDir)/TGitCache.exe"\r
                                LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\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
index 7f6efec..bf757c1 100644 (file)
@@ -325,8 +325,8 @@ Global
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|x64.ActiveCfg = debug_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|Win32.Build.0 = Debug|Win32\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|x64\r
-               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|x64\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {72EFB681-1397-4193-BBF9-CA05AC52B75D}.Debug|x64.Build.0 = Debug|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.ActiveCfg = release_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|Win32.Build.0 = release_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.release_static|x64.ActiveCfg = release_static|Win32\r
@@ -347,7 +347,6 @@ Global
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.Build.0 = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.ActiveCfg = Release|x64\r
-               {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|x64.Build.0 = Release|x64\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|Win32.Build.0 = Debug|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -361,7 +360,6 @@ Global
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.ActiveCfg = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|Win32.Build.0 = Release|Win32\r
                {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.ActiveCfg = Release|x64\r
-               {EC88E7EC-3074-4841-BA45-B938D098EFF6}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 98a3f83..2dcbf83 100644 (file)
@@ -36,6 +36,8 @@ void CGitMFCTabCtrl::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
        pWnd->OnLvnItemchangedLoglist(pNMHDR,pResult);\r
 }\r
 \r
+IMPLEMENT_DYNAMIC(COutputWnd, CDockablePane)\r
+\r
 BEGIN_MESSAGE_MAP(COutputWnd, CDockablePane)\r
        ON_WM_CREATE()\r
        ON_WM_SIZE()\r
index f9eb5ef..f33ec27 100644 (file)
@@ -37,6 +37,7 @@ protected:
 \r
 class COutputWnd : public CDockablePane\r
 {\r
+       DECLARE_DYNAMIC(COutputWnd)\r
 // Construction\r
 public:\r
        COutputWnd();\r
index 4a00c9e..82e1234 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="gb2312"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="TortoiseGitBlame"\r
        ProjectGUID="{62507C2F-9290-4342-910F-BFC44DF99B01}"\r
        RootNamespace="TortoiseGitBlame"\r
@@ -75,7 +75,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="LIBCMTD"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\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=""\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="17"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       UseOfMFC="2"\r
+                       UseOfMFC="1"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
                                MinimalRebuild="false"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\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=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
-                       UseOfMFC="2"\r
+                       UseOfMFC="1"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
                                MinimalRebuild="false"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\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=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r
index 188211a..3316b7a 100644 (file)
@@ -50,8 +50,6 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\..\./,..\..\..\charset/,..\..\..\windows/,..\..\..\unix/,..\..\..\mac/,..\..\..\macosx/"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION"\r
                                StringPooling="true"\r
@@ -82,6 +80,7 @@
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
                                OptimizeForWindows98="0"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="..\..\..\./,..\..\..\charset/,..\..\..\windows/,..\..\..\unix/,..\..\..\mac/,..\..\..\macosx/"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION"\r
                                StringPooling="true"\r
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
                                OptimizeForWindows98="1"\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
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\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
                                OutputFile="$(OutDir)\$(ProjectName).exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="2"\r
index 30d40fa..49436a4 100644 (file)
@@ -24,7 +24,7 @@
 #include "..\version.h"\r
 //#include "AppUtils.h"\r
 \r
-IMPLEMENT_DYNAMIC(CAboutDlg, CStandAloneDialog)\r
+//IMPLEMENT_DYNAMIC(CAboutDlg, CStandAloneDialog)\r
 CAboutDlg::CAboutDlg(CWnd* pParent /*=NULL*/)\r
        : CStandAloneDialog(CAboutDlg::IDD, pParent)\r
 {\r
index d35c1b3..bb1207d 100644 (file)
@@ -35,7 +35,7 @@
  */\r
 class CAboutDlg : public CStandAloneDialog\r
 {\r
-       DECLARE_DYNAMIC(CAboutDlg)\r
+//     DECLARE_DYNAMIC(CAboutDlg)\r
 \r
 public:\r
        CAboutDlg(CWnd* pParent = NULL);   // standard constructor\r
index 3fb96b9..a5e13ec 100644 (file)
@@ -21,7 +21,7 @@
 #include "BlameDlg.h"\r
 #include "Registry.h"\r
 \r
-IMPLEMENT_DYNAMIC(CBlameDlg, CStandAloneDialog)\r
+//IMPLEMENT_DYNAMIC(CBlameDlg, CStandAloneDialog)\r
 CBlameDlg::CBlameDlg(CWnd* pParent /*=NULL*/)\r
        : CStandAloneDialog(CBlameDlg::IDD, pParent)\r
 //     , StartRev(1)\r
index d7e3904..ef251c5 100644 (file)
@@ -28,7 +28,7 @@
  */\r
 class CBlameDlg : public CStandAloneDialog\r
 {\r
-       DECLARE_DYNAMIC(CBlameDlg)\r
+//     DECLARE_DYNAMIC(CBlameDlg)\r
 \r
 public:\r
        CBlameDlg(CWnd* pParent = NULL);   // standard constructor\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 9119f74..2ede6e3 100644 (file)
@@ -18,6 +18,7 @@
 #include "stdafx.h"\r
 #include "SettingsPropPage.h"\r
 \r
+IMPLEMENT_DYNAMIC(ISettingsPropPage, CPropertyPage)\r
 \r
 ISettingsPropPage::ISettingsPropPage() : CPropertyPage()\r
        , m_restart(Restart_None)\r
index 3216611..77fbfe2 100644 (file)
@@ -24,6 +24,7 @@
  */\r
 class ISettingsPropPage : public CPropertyPage\r
 {\r
+       DECLARE_DYNAMIC(ISettingsPropPage)\r
 public:\r
        // simple construction\r
        ISettingsPropPage();\r
index c2cdcd9..145ffd8 100644 (file)
@@ -21,7 +21,7 @@
 #include "SettingsRevisionGraph.h"\r
 #include "MessageBox.h"\r
 \r
-IMPLEMENT_DYNAMIC(CSettingsRevisionGraph, ISettingsPropPage)\r
+//IMPLEMENT_DYNAMIC(CSettingsRevisionGraph, ISettingsPropPage)\r
 \r
 CSettingsRevisionGraph::CSettingsRevisionGraph()\r
        : ISettingsPropPage(CSettingsRevisionGraph::IDD)\r
index 43b4cde..d4e3fd5 100644 (file)
@@ -31,7 +31,7 @@ class CProgressDlg;
 class CSettingsRevisionGraph \r
     : public ISettingsPropPage\r
 {\r
-       DECLARE_DYNAMIC(CSettingsRevisionGraph)\r
+//     DECLARE_DYNAMIC(CSettingsRevisionGraph)\r
 \r
 public:\r
        CSettingsRevisionGraph();\r
index 5d6ba9d..080e8bd 100644 (file)
@@ -24,7 +24,7 @@
 \r
 // CSettingsTBlame dialog\r
 \r
-IMPLEMENT_DYNAMIC(CSettingsTBlame, ISettingsPropPage)\r
+//IMPLEMENT_DYNAMIC(CSettingsTBlame, ISettingsPropPage)\r
 \r
 CSettingsTBlame::CSettingsTBlame()\r
        : ISettingsPropPage(CSettingsTBlame::IDD)\r
index 5ceda66..a0d4ac7 100644 (file)
@@ -27,7 +27,7 @@
  */\r
 class CSettingsTBlame : public ISettingsPropPage\r
 {\r
-       DECLARE_DYNAMIC(CSettingsTBlame)\r
+//     DECLARE_DYNAMIC(CSettingsTBlame)\r
 \r
 public:\r
        CSettingsTBlame();\r
index 1543d5c..f5e2282 100644 (file)
@@ -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
                                />\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
index 1b54c51..f013e00 100644 (file)
@@ -23,8 +23,8 @@
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
-                       UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfMFC="2"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        >\r
@@ -90,7 +90,7 @@
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories=""\r
                                IgnoreAllDefaultLibraries="false"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                        />\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
+                       UseOfMFC="2"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\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="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;_TORTOISESHELL"\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
                        <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)/TortoiseGit.dll"\r
-                               LinkIncremental="1"\r
+                               OutputFile="$(OutDir)/TortoiseSVN.dll"\r
+                               LinkIncremental="0"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=""\r
-                               IgnoreDefaultLibraryNames="libcd, libc, shell32"\r
+                               IgnoreAllDefaultLibraries="false"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\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
                        />\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
                        ATLMinimizesCRunTimeLibraryUsage="false"\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="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="0"\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
                        <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
                        IntermediateDirectory="..\..\obj\TortoiseShell\Release64"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfATL="0"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        />\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
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
                                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
                                        />\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
index 910d186..fc96bb3 100644 (file)
@@ -66,6 +66,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                RandomizedBaseAddress="1"\r
                        />\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
+                               IgnoreDefaultLibraryNames=""\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="0"\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
+                               IgnoreDefaultLibraryNames=""\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
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
+                               IgnoreDefaultLibraryNames=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\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
index dacefa6..cbfeba7 100644 (file)
@@ -43,6 +43,8 @@ void CHintListCtrl::ClearText()
        Invalidate();\r
 }\r
 \r
+IMPLEMENT_DYNAMIC(CHintListCtrl, CListCtrl)\r
+\r
 BEGIN_MESSAGE_MAP(CHintListCtrl, CListCtrl)\r
        ON_WM_PAINT()\r
 END_MESSAGE_MAP()\r
index 79494fe..75e0fdd 100644 (file)
@@ -26,6 +26,7 @@
  */\r
 class CHintListCtrl : public CListCtrl\r
 {\r
+       DECLARE_DYNAMIC(CHintListCtrl)\r
 public: \r
        CHintListCtrl();\r
        ~CHintListCtrl();\r
index 3807c46..d9610fc 100644 (file)
@@ -32,7 +32,7 @@ static char THIS_FILE[]=__FILE__;
 const int g_ciArrowSizeX = 4 ;\r
 const int g_ciArrowSizeY = 2 ;\r
 \r
-IMPLEMENT_DYNCREATE(CMenuButton, _Inherited)\r
+IMPLEMENT_DYNCREATE(CMenuButton, COddButton)\r
 \r
 CMenuButton::CMenuButton(void):\r
        _Inherited(),\r
index 7f99c3b..feadf41 100644 (file)
@@ -40,6 +40,7 @@ COddButton::~COddButton()
 {\r
 }\r
 \r
+IMPLEMENT_DYNAMIC(COddButton, CButton)\r
 \r
 BEGIN_MESSAGE_MAP(COddButton, CButton)\r
        //{{AFX_MSG_MAP(COddButton)\r
index fbe9202..69f6cd9 100644 (file)
@@ -43,6 +43,7 @@
 */\r
 class COddButton : public CButton\r
 {\r
+       DECLARE_DYNAMIC(COddButton)\r
 // Construction\r
 public:\r
        COddButton();\r
index fb9e8d3..3e09865 100644 (file)
@@ -20,7 +20,7 @@
 #include "Resource.h"\r
 #include "StandAloneDlg.h"\r
 \r
-IMPLEMENT_DYNAMIC(CResizableStandAloneDialog, CStandAloneDialogTmpl<CResizableDialog>)\r
+IMPLEMENT_DYNAMIC(CResizableStandAloneDialog, CDialog)\r
 CResizableStandAloneDialog::CResizableStandAloneDialog(UINT nIDTemplate, CWnd* pParentWnd /*= NULL*/)\r
        : CStandAloneDialogTmpl<CResizableDialog>(nIDTemplate, pParentWnd)\r
        , m_bVertical(false)\r
index 120ea25..b4498ef 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="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="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
-                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="2"\r
-                       UseOfATL="1"\r
+                       UseOfMFC="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="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="2"\r
+                       UseOfMFC="1"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\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
index 94dd406..29aa2ac 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
                                AdditionalIncludeDirectories=".\zlib;..\crashrpt"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="false"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="0"\r
                                SmallerTypeCheck="false"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
                                AdditionalIncludeDirectories=".\zlib;..\crashrpt"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="false"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="0"\r
                                SmallerTypeCheck="false"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r