Linked with static version of CRT/MFC.

diff --git a/ext/ResizableLib/ResizableLib.vcproj b/ext/ResizableLib/ResizableLib.vcproj
index d60a260..13f7fca 100644 (file)
--- a/ext/ResizableLib/ResizableLib.vcproj
+++ b/ext/ResizableLib/ResizableLib.vcproj
@@ -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
@@ -102,7 +102,7 @@
                        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
@@ -130,7 +130,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

diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj
index 9e0c07a..9ae2b63 100644 (file)
--- a/ext/hunspell/hunspell.vcproj
+++ b/ext/hunspell/hunspell.vcproj
@@ -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
@@ -120,8 +118,6 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
                                PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r

diff --git a/ext/scintilla/vcbuild/SciLexer.vcproj b/ext/scintilla/vcbuild/SciLexer.vcproj
index 6de1ebb..a5a2a68 100644 (file)
--- a/ext/scintilla/vcbuild/SciLexer.vcproj
+++ b/ext/scintilla/vcbuild/SciLexer.vcproj
@@ -232,8 +232,6 @@
                        />\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
@@ -324,8 +322,6 @@
                        />\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
@@ -4330,11 +4326,11 @@
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
+                       RelativePath="ReadMe.txt"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="ReadMe.txt"\r
+                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r

diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index f438b99..52ecdc7 100644 (file)
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -85,13 +85,13 @@
                        />\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
@@ -107,19 +107,19 @@
                        />\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
@@ -132,7 +132,6 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -151,13 +150,13 @@
                        />\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
@@ -173,19 +172,17 @@
                        />\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
@@ -198,6 +195,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -220,7 +218,7 @@
                        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
@@ -242,11 +240,9 @@
                        />\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
@@ -325,7 +321,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -333,7 +329,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r

diff --git a/src/IBugTraqProvider/IBugTraqProvider.vcproj b/src/IBugTraqProvider/IBugTraqProvider.vcproj
index bebd9e1..eb4cac9 100644 (file)
--- a/src/IBugTraqProvider/IBugTraqProvider.vcproj
+++ b/src/IBugTraqProvider/IBugTraqProvider.vcproj
@@ -167,10 +167,8 @@
                        />\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
@@ -230,10 +228,8 @@
                        />\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

diff --git a/src/ResText/ResText.vcproj b/src/ResText/ResText.vcproj
index 36e63c5..69de2e6 100644 (file)
--- a/src/ResText/ResText.vcproj
+++ b/src/ResText/ResText.vcproj
@@ -201,8 +201,6 @@
                        />\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
@@ -284,11 +282,9 @@
                        />\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

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index 2355772..32cda69 100644 (file)
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -217,10 +217,9 @@
                        />\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="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
@@ -302,10 +301,9 @@
                        />\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

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index 5257ba3..fbd4b32 100644 (file)
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -345,7 +345,6 @@ Global
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.release_static|x64.ActiveCfg = Release|Win32\r
                {1B3C273E-6DDF-4FBE-BA31-F9F39C6DAC99}.Release|Win32.ActiveCfg = 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
@@ -359,7 +358,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

diff --git a/src/TortoiseGitBlame/OutputWnd.cpp b/src/TortoiseGitBlame/OutputWnd.cpp
index 98a3f83..2dcbf83 100644 (file)
--- a/src/TortoiseGitBlame/OutputWnd.cpp
+++ b/src/TortoiseGitBlame/OutputWnd.cpp
@@ -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

diff --git a/src/TortoiseGitBlame/OutputWnd.h b/src/TortoiseGitBlame/OutputWnd.h
index f9eb5ef..f33ec27 100644 (file)
--- a/src/TortoiseGitBlame/OutputWnd.h
+++ b/src/TortoiseGitBlame/OutputWnd.h
@@ -37,6 +37,7 @@ protected:
 \r
 class COutputWnd : public CDockablePane\r
 {\r
+       DECLARE_DYNAMIC(COutputWnd)\r
 // Construction\r
 public:\r
        COutputWnd();\r

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 4a00c9e..c953805 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -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
@@ -189,7 +189,7 @@
                        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
@@ -213,12 +213,10 @@
                        />\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
@@ -275,7 +273,7 @@
                        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
@@ -299,12 +297,10 @@
                        />\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
@@ -544,19 +540,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
+                               RelativePath=".\res\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd_hc.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
+                               RelativePath=".\res\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -568,19 +564,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
+                               RelativePath=".\res\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_hc.bmp"\r
+                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
+                               RelativePath=".\res\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -592,19 +588,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
+                               RelativePath=".\res\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
+                               RelativePath=".\res\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar256.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
@@ -652,11 +648,11 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
+                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
+                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
index 1b81952..29b8032 100644 (file)
--- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
+++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
@@ -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
@@ -145,8 +143,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

diff --git a/src/TortoiseProc/AboutDlg.cpp b/src/TortoiseProc/AboutDlg.cpp
index 30d40fa..49436a4 100644 (file)
--- a/src/TortoiseProc/AboutDlg.cpp
+++ b/src/TortoiseProc/AboutDlg.cpp
@@ -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

diff --git a/src/TortoiseProc/AboutDlg.h b/src/TortoiseProc/AboutDlg.h
index d35c1b3..bb1207d 100644 (file)
--- a/src/TortoiseProc/AboutDlg.h
+++ b/src/TortoiseProc/AboutDlg.h
@@ -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

diff --git a/src/TortoiseProc/BlameDlg.cpp b/src/TortoiseProc/BlameDlg.cpp
index 3fb96b9..a5e13ec 100644 (file)
--- a/src/TortoiseProc/BlameDlg.cpp
+++ b/src/TortoiseProc/BlameDlg.cpp
@@ -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

diff --git a/src/TortoiseProc/BlameDlg.h b/src/TortoiseProc/BlameDlg.h
index d7e3904..ef251c5 100644 (file)
--- a/src/TortoiseProc/BlameDlg.h
+++ b/src/TortoiseProc/BlameDlg.h
@@ -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

diff --git a/src/TortoiseProc/Settings/SettingsPropPage.cpp b/src/TortoiseProc/Settings/SettingsPropPage.cpp
index 9119f74..2ede6e3 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsPropPage.cpp
+++ b/src/TortoiseProc/Settings/SettingsPropPage.cpp
@@ -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

diff --git a/src/TortoiseProc/Settings/SettingsPropPage.h b/src/TortoiseProc/Settings/SettingsPropPage.h
index 3216611..77fbfe2 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsPropPage.h
+++ b/src/TortoiseProc/Settings/SettingsPropPage.h
@@ -24,6 +24,7 @@
  */\r
 class ISettingsPropPage : public CPropertyPage\r
 {\r
+       DECLARE_DYNAMIC(ISettingsPropPage)\r
 public:\r
        // simple construction\r
        ISettingsPropPage();\r

diff --git a/src/TortoiseProc/Settings/SettingsRevisionGraph.cpp b/src/TortoiseProc/Settings/SettingsRevisionGraph.cpp
index c2cdcd9..145ffd8 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsRevisionGraph.cpp
+++ b/src/TortoiseProc/Settings/SettingsRevisionGraph.cpp
@@ -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

diff --git a/src/TortoiseProc/Settings/SettingsRevisionGraph.h b/src/TortoiseProc/Settings/SettingsRevisionGraph.h
index 43b4cde..d4e3fd5 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsRevisionGraph.h
+++ b/src/TortoiseProc/Settings/SettingsRevisionGraph.h
@@ -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

diff --git a/src/TortoiseProc/Settings/SettingsTBlame.cpp b/src/TortoiseProc/Settings/SettingsTBlame.cpp
index 5d6ba9d..080e8bd 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsTBlame.cpp
+++ b/src/TortoiseProc/Settings/SettingsTBlame.cpp
@@ -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

diff --git a/src/TortoiseProc/Settings/SettingsTBlame.h b/src/TortoiseProc/Settings/SettingsTBlame.h
index 5ceda66..a0d4ac7 100644 (file)
--- a/src/TortoiseProc/Settings/SettingsTBlame.h
+++ b/src/TortoiseProc/Settings/SettingsTBlame.h
@@ -27,7 +27,7 @@
  */\r
 class CSettingsTBlame : public ISettingsPropPage\r
 {\r
-       DECLARE_DYNAMIC(CSettingsTBlame)\r
+//     DECLARE_DYNAMIC(CSettingsTBlame)\r
 \r
 public:\r
        CSettingsTBlame();\r

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index 1543d5c..c0c5e9f 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -109,13 +109,13 @@
                        />\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
@@ -131,35 +131,31 @@
                        />\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
@@ -169,19 +165,14 @@
                        <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
+                               LinkIncremental="2"\r
                                IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\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
@@ -206,13 +197,13 @@
                        />\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
@@ -228,31 +219,32 @@
                        />\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
@@ -262,14 +254,19 @@
                        <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
@@ -298,7 +295,7 @@
                        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
@@ -322,15 +319,12 @@
                        />\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
@@ -355,7 +349,7 @@
                                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
@@ -1918,7 +1912,7 @@
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Release|Win32"\r
+                               Name="Debug|x64"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r
@@ -1926,7 +1920,7 @@
                                />\r
                        </FileConfiguration>\r
                        <FileConfiguration\r
-                               Name="Debug|x64"\r
+                               Name="Release|Win32"\r
                                >\r
                                <Tool\r
                                        Name="VCCLCompilerTool"\r

diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index 1b54c51..47e48dc 100644 (file)
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -127,15 +127,14 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\Debug64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        UseOfATL="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -151,39 +150,38 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
-                               TargetEnvironment="1"\r
-                               TypeLibraryName=".\Release/TortoiseShell.tlb"\r
+                               TargetEnvironment="3"\r
+                               TypeLibraryName=".\Debug/TortoiseShell.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               InlineFunctionExpansion="1"\r
-                               EnableIntrinsicFunctions="true"\r
-                               FavorSizeOrSpeed="1"\r
-                               OmitFramePointers="true"\r
+                               Optimization="0"\r
+                               InlineFunctionExpansion="0"\r
                                AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_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
@@ -192,26 +190,21 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                IgnoreImportLibrary="true"\r
-                               AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\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="LIBC"\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
@@ -236,14 +229,15 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\Debug64\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseShell\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
                        UseOfATL="1"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -259,38 +253,35 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="true"\r
                                SuppressStartupBanner="true"\r
-                               TargetEnvironment="3"\r
-                               TypeLibraryName=".\Debug/TortoiseShell.tlb"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Release/TortoiseShell.tlb"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               InlineFunctionExpansion="0"\r
                                AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"\r
-                               PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;SVN_DEBUG"\r
-                               BasicRuntimeChecks="1"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_TORTOISESHELL"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="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
@@ -299,21 +290,26 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                IgnoreImportLibrary="true"\r
+                               AdditionalOptions="/MACHINE:I386"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               OutputFile="$(OutDir)/TortoiseSVN.dll"\r
-                               LinkIncremental="0"\r
+                               OutputFile="$(OutDir)/TortoiseGit.dll"\r
+                               LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               IgnoreAllDefaultLibraries="false"\r
-                               IgnoreDefaultLibraryNames="LIBC"\r
+                               AdditionalLibraryDirectories=""\r
+                               IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
-                               ProgramDatabaseFile="$(OutDir)/TortoiseSVN.pdb"\r
+                               ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="0"\r
                                BaseAddress="0x5960000"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               ImportLibrary="..\..\obj\TortoiseShell\Debug64/TortoiseSVN.lib"\r
-                               TargetMachine="17"\r
+                               ImportLibrary="..\..\obj\TortoiseShell\Release/TortoiseSVN.lib"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -370,14 +366,10 @@
                        />\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
@@ -407,7 +399,7 @@
                                OutputFile="$(OutDir)/TortoiseGit.dll"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               IgnoreDefaultLibraryNames="libcd, libc, shell32"\r
+                               IgnoreDefaultLibraryNames=""\r
                                ModuleDefinitionFile=".\ShellExt.def"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
@@ -540,7 +532,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -548,7 +540,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r

diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcproj b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index fa80b31..5a0fa5a 100644 (file)
--- a/src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/src/TortoiseUDiff/TortoiseUDiff.vcproj
@@ -196,7 +196,7 @@
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
@@ -273,7 +273,7 @@
                                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

diff --git a/src/Utils/MiscUI/HintListCtrl.cpp b/src/Utils/MiscUI/HintListCtrl.cpp
index dacefa6..cbfeba7 100644 (file)
--- a/src/Utils/MiscUI/HintListCtrl.cpp
+++ b/src/Utils/MiscUI/HintListCtrl.cpp
@@ -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

diff --git a/src/Utils/MiscUI/HintListCtrl.h b/src/Utils/MiscUI/HintListCtrl.h
index 79494fe..75e0fdd 100644 (file)
--- a/src/Utils/MiscUI/HintListCtrl.h
+++ b/src/Utils/MiscUI/HintListCtrl.h
@@ -26,6 +26,7 @@
  */\r
 class CHintListCtrl : public CListCtrl\r
 {\r
+       DECLARE_DYNAMIC(CHintListCtrl)\r
 public: \r
        CHintListCtrl();\r
        ~CHintListCtrl();\r

diff --git a/src/Utils/MiscUI/MenuButton.cpp b/src/Utils/MiscUI/MenuButton.cpp
index 3807c46..d9610fc 100644 (file)
--- a/src/Utils/MiscUI/MenuButton.cpp
+++ b/src/Utils/MiscUI/MenuButton.cpp
@@ -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

diff --git a/src/Utils/MiscUI/OddButton.cpp b/src/Utils/MiscUI/OddButton.cpp
index 7f99c3b..feadf41 100644 (file)
--- a/src/Utils/MiscUI/OddButton.cpp
+++ b/src/Utils/MiscUI/OddButton.cpp
@@ -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

diff --git a/src/Utils/MiscUI/OddButton.h b/src/Utils/MiscUI/OddButton.h
index fbe9202..69f6cd9 100644 (file)
--- a/src/Utils/MiscUI/OddButton.h
+++ b/src/Utils/MiscUI/OddButton.h
@@ -43,6 +43,7 @@
 */\r
 class COddButton : public CButton\r
 {\r
+       DECLARE_DYNAMIC(COddButton)\r
 // Construction\r
 public:\r
        COddButton();\r

diff --git a/src/Utils/MiscUI/StandAloneDlg.cpp b/src/Utils/MiscUI/StandAloneDlg.cpp
index fb9e8d3..3e09865 100644 (file)
--- a/src/Utils/MiscUI/StandAloneDlg.cpp
+++ b/src/Utils/MiscUI/StandAloneDlg.cpp
@@ -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

diff --git a/src/Utils/Utils.vcproj b/src/Utils/Utils.vcproj
index 120ea25..972cee3 100644 (file)
--- a/src/Utils/Utils.vcproj
+++ b/src/Utils/Utils.vcproj
@@ -85,13 +85,13 @@
                        />\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
@@ -107,19 +107,19 @@
                        />\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="0"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -150,13 +150,13 @@
                        />\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
@@ -172,19 +172,17 @@
                        />\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
@@ -219,7 +217,7 @@
                        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
@@ -241,11 +239,9 @@
                        />\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
@@ -368,7 +364,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -376,7 +372,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r

diff --git a/src/crashrpt/CrashRpt.vcproj b/src/crashrpt/CrashRpt.vcproj
index 94dd406..29aa2ac 100644 (file)
--- a/src/crashrpt/CrashRpt.vcproj
+++ b/src/crashrpt/CrashRpt.vcproj
@@ -52,16 +52,13 @@
                        />\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
@@ -162,16 +159,13 @@
                        />\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