OSDN Git Service

Dynamic linking to CRT/MFC.
authorjackie <jackie@gmail.com>
Mon, 2 Mar 2009 05:22:34 +0000 (13:22 +0800)
committerjackie <jackie@gmail.com>
Mon, 2 Mar 2009 05:22:34 +0000 (13:22 +0800)
16 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/TortoiseGitBlame.vcproj
src/TortoiseGitSetup/CustomActions/CustomActions.vcproj
src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseShell/TortoiseShell.vcproj
src/TortoiseUDiff/TortoiseUDiff.vcproj
src/Utils/Utils.vcproj
src/crashrpt/CrashRpt.vcproj

index 13f7fca..d60a260 100644 (file)
@@ -24,7 +24,7 @@
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\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="0"\r
+                               RuntimeLibrary="2"\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="1"\r
+                       UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                                FavorSizeOrSpeed="2"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
index 9ae2b63..0b2b75f 100644 (file)
@@ -47,7 +47,7 @@
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
index a5a2a68..367c1a7 100644 (file)
                                AdditionalIncludeDirectories="..\include,..\src"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/SciLexer.pch"\r
                                WarningLevel="4"\r
                                AdditionalIncludeDirectories="..\include,..\src"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/SciLexer.pch"\r
                                WarningLevel="4"\r
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="ReadMe.txt"\r
+                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
+                       RelativePath="ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r
index 52ecdc7..9d29d78 100644 (file)
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../utils"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../utils"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
index eb4cac9..d0df98a 100644 (file)
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
index 69de2e6..1a85603 100644 (file)
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
index fca03c7..9f7291b 100644 (file)
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"\r
                        ConfigurationType="1"\r
-                       UseOfATL="1"\r
+                       UseOfATL="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                Name="VCCLCompilerTool"\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="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                        OutputDirectory="..\..\bin\Release64\bin"\r
                        IntermediateDirectory="..\..\obj\TGitCache\Release64"\r
                        ConfigurationType="1"\r
-                       UseOfATL="1"\r
+                       UseOfATL="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                Name="VCCLCompilerTool"\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="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
        </Files>\r
        <Globals>\r
        </Globals>\r
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>\r
index 595fec3..0ed498f 100644 (file)
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual C++ Express 2008\r
+# Visual Studio 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseProc", "TortoiseProc\TortoiseProc.vcproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}"\r
@@ -99,7 +99,8 @@ Global
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.release_static|x64.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32\r
                {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32\r
-               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|Win32\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|x64\r
+               {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.Build.0 = Release|x64\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|Win32.Build.0 = Debug|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -111,7 +112,8 @@ Global
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.release_static|x64.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.ActiveCfg = Release|Win32\r
                {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|Win32.Build.0 = Release|Win32\r
-               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|Win32\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.ActiveCfg = Release|x64\r
+               {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Release|x64.Build.0 = Release|x64\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|Win32.Build.0 = Debug|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -123,7 +125,8 @@ Global
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.release_static|x64.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.ActiveCfg = Release|Win32\r
                {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|Win32.Build.0 = Release|Win32\r
-               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|Win32\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.ActiveCfg = Release|x64\r
+               {BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}.Release|x64.Build.0 = Release|x64\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|Win32.Build.0 = Debug|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -135,7 +138,8 @@ Global
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.release_static|x64.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.ActiveCfg = Release|Win32\r
                {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|Win32.Build.0 = Release|Win32\r
-               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|Win32\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.ActiveCfg = Release|x64\r
+               {E873DD32-5A31-4DE1-8341-A56A2A5489EA}.Release|x64.Build.0 = Release|x64\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|Win32.Build.0 = Debug|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -147,7 +151,8 @@ Global
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.release_static|x64.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.ActiveCfg = Release|Win32\r
                {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|Win32.Build.0 = Release|Win32\r
-               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|Win32\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.ActiveCfg = Release|x64\r
+               {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}.Release|x64.Build.0 = Release|x64\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|Win32.Build.0 = Debug|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -159,7 +164,8 @@ Global
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.release_static|x64.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.ActiveCfg = Release|Win32\r
                {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|Win32.Build.0 = Release|Win32\r
-               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|Win32\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.ActiveCfg = Release|x64\r
+               {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}.Release|x64.Build.0 = Release|x64\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|Win32.Build.0 = Debug|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -171,7 +177,8 @@ Global
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.release_static|x64.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.ActiveCfg = Release|Win32\r
                {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|Win32.Build.0 = Release|Win32\r
-               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|Win32\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.ActiveCfg = Release|x64\r
+               {4BE529FB-C2F2-49F7-A897-054B955564CF}.Release|x64.Build.0 = Release|x64\r
                {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|Win32.Build.0 = Debug|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -183,7 +190,8 @@ Global
                {A5498556-CE09-4095-8335-08FC8370552D}.release_static|x64.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.ActiveCfg = Release|Win32\r
                {A5498556-CE09-4095-8335-08FC8370552D}.Release|Win32.Build.0 = Release|Win32\r
-               {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|Win32\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.ActiveCfg = Release|x64\r
+               {A5498556-CE09-4095-8335-08FC8370552D}.Release|x64.Build.0 = Release|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|Win32.ActiveCfg = Debug|x86\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.ActiveCfg = Debug|x64\r
                {150172A5-8D02-4C00-ABB5-BD99D4B16B4C}.debug_static|x64.Build.0 = Debug|x64\r
@@ -209,7 +217,8 @@ Global
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.release_static|x64.ActiveCfg = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32\r
                {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32\r
-               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|Win32\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.ActiveCfg = Release|x64\r
+               {A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x64.Build.0 = Release|x64\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|Win32.Build.0 = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.debug_static|x64.ActiveCfg = Release|Win32\r
@@ -221,7 +230,8 @@ Global
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.release_static|x64.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.ActiveCfg = Release|Win32\r
                {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|Win32.Build.0 = Release|Win32\r
-               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|Win32\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.ActiveCfg = Release|x64\r
+               {13BC1836-2726-45C4-9249-5BA2BBBF8328}.Release|x64.Build.0 = Release|x64\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|Win32.Build.0 = Debug|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -233,7 +243,8 @@ Global
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.release_static|x64.ActiveCfg = Release|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.ActiveCfg = Release|Win32\r
                {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|Win32.Build.0 = Release|Win32\r
-               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|Win32\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.ActiveCfg = Release|x64\r
+               {D3AFBFBE-5501-4077-B3B4-3D28BBCA8F20}.Release|x64.Build.0 = Release|x64\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.ActiveCfg = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|Win32.Build.0 = Release|Win32\r
                {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.debug_static|x64.ActiveCfg = Release|x64\r
@@ -261,7 +272,8 @@ Global
                {62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32\r
                {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32\r
-               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|Win32\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|x64\r
+               {62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.Build.0 = Release|x64\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.ActiveCfg = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.Build.0 = Debug|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|x64.ActiveCfg = Debug|Win32\r
@@ -273,7 +285,8 @@ Global
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.release_static|x64.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.ActiveCfg = Release|Win32\r
                {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32\r
-               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|Win32\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|x64\r
+               {2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.Build.0 = Release|x64\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Win32.ActiveCfg = debug_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|Win32.Build.0 = debug_static|Win32\r
                {72EFB681-1397-4193-BBF9-CA05AC52B75D}.debug_static|x64.ActiveCfg = debug_static|Win32\r
index 82e1234..896d331 100644 (file)
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\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="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\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="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                >\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
                                >\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
                                >\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
                                </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
index 1891316..9e7ec64 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONS_EXPORTS"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONS_EXPORTS"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
index 3316b7a..70b71a2 100644 (file)
@@ -53,7 +53,7 @@
                                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
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"\r
                                AssemblerListingLocation=".\Release/"\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
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"\r
                                AssemblerListingLocation=".\Release/"\r
index 02f1829..634b64b 100644 (file)
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="2"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                        OutputDirectory="..\..\bin\Release64\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseProc\Release64"\r
                        ConfigurationType="1"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
                                ExceptionHandling="2"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
index f013e00..cc5cbb4 100644 (file)
                        IntermediateDirectory="..\..\obj\TortoiseShell\$(ConfigurationName)\"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
-                       UseOfATL="1"\r
+                       UseOfATL="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                                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="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
                        IntermediateDirectory="..\..\obj\TortoiseShell\Release64"\r
                        ConfigurationType="2"\r
                        UseOfMFC="0"\r
-                       UseOfATL="0"\r
+                       UseOfATL="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                                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="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
index fc96bb3..10a3629 100644 (file)
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
index b4498ef..6262ffc 100644 (file)
                        OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                        OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
                        IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
-                       UseOfMFC="1"\r
+                       UseOfMFC="2"\r
                        CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
index 29aa2ac..fa34ca1 100644 (file)
@@ -58,7 +58,7 @@
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="0"\r
                                SmallerTypeCheck="false"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="0"\r
                                SmallerTypeCheck="false"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                BufferSecurityCheck="false"\r
                                EnableFunctionLevelLinking="false"\r
                                ForceConformanceInForLoopScope="true"\r