From ee3d7daf4c5a27d071958cf33e150cacccf66cc7 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 22 Dec 2012 01:09:00 +0100
Subject: [PATCH] Consistently use /GL, /GF, /LTCG, /RELEASE, /Gy, /OPT:REF,ICF
 and /O2 for all the projects except for CrashHandler

Inspired by TortoiseSVN revision 23620.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 ext/CrashServer/CommonLibs/Zlib/Zlib.vcproj        |  6 ++--
 .../CrashHandler/CrashHandler/CrashHandler.vcproj  |  6 ++--
 .../DumpUploaderServiceLib.vcproj                  |  6 ++--
 .../CrashHandler/SendRpt/SendRpt.vcproj            |  6 ++--
 ext/OGDF/ogdf.vcproj                               | 10 +++++--
 ext/ResizableLib/ResizableLib.vcproj               | 10 +++----
 ext/build/ScintillaLexer.vcproj                    | 14 +++++++++
 ext/build/libapr.vcproj                            | 14 +++++++--
 ext/build/libaprutil.vcproj                        | 14 +++++++--
 ext/build/libcurl.vcproj                           | 34 ++++++++++++++--------
 ext/build/libgit2.vcproj                           | 13 +++++++--
 ext/build/xml.vcproj                               |  8 +++--
 ext/build/zlib.vcproj                              | 20 +++++++++----
 ext/gitdll/gitdll.vcproj                           |  4 +++
 ext/hunspell/hunspell.vcproj                       |  6 ++++
 ext/tgit                                           |  2 +-
 src/AsyncFramework/AsyncFramework.vcproj           |  6 ++++
 src/Git/Git.vcproj                                 | 10 +++++--
 src/IBugTraqProvider/IBugTraqProvider.vcproj       |  2 ++
 src/ResText/ResText.vcproj                         | 11 +++----
 src/SshAskPass/SshAskPass.vcproj                   |  2 ++
 src/TGitCache/TGITCache.vcproj                     |  9 ++++--
 src/TortoiseGitBlame/TortoiseGitBlame.vcproj       |  6 ++++
 src/TortoiseGitBlame/TortoiseGitBlameLang.vcproj   | 10 ++-----
 src/TortoiseIDiff/TortoiseIDiff.vcproj             | 12 ++++----
 src/TortoiseIDiff/TortoiseIDiffLang.vcproj         |  8 ++---
 src/TortoiseMerge/TortoiseMerge.vcproj             | 14 ++++++---
 src/TortoiseMerge/TortoiseMergeLang.vcproj         |  9 ++----
 .../Windows/MSVC/Plink/TortoisePlink.vcproj        | 27 ++++++++++-------
 src/TortoiseProc/TortoiseProc.vcproj               |  8 +++--
 src/TortoiseProc/TortoiseProcLang.vcproj           | 22 +++++++-------
 src/TortoiseShell/TortoiseShell.vcproj             | 14 +++++----
 src/TortoiseShell/TortoiseStub.vcproj              | 26 +++++++----------
 src/TortoiseUDiff/TortoiseUDiff.vcproj             |  9 +++++-
 src/Utils/Utils.vcproj                             | 10 +++++--
 src/touch/touch.vcproj                             |  2 ++
 36 files changed, 257 insertions(+), 133 deletions(-)

diff --git a/ext/CrashServer/CommonLibs/Zlib/Zlib.vcproj b/ext/CrashServer/CommonLibs/Zlib/Zlib.vcproj
index b5b4c5e72..1dd906c4d 100644
--- a/ext/CrashServer/CommonLibs/Zlib/Zlib.vcproj
+++ b/ext/CrashServer/CommonLibs/Zlib/Zlib.vcproj
@@ -105,8 +105,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="$(ProjectDir)..\..\external\zlib123"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
@@ -231,8 +232,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="$(ProjectDir)..\..\external\zlib123"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
diff --git a/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcproj b/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcproj
index f61273f08..7eb3254a5 100644
--- a/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcproj
+++ b/ext/CrashServer/CrashHandler/CrashHandler/CrashHandler.vcproj
@@ -119,8 +119,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\gsoap-win32-2.8.0;..\zlib123;..\wtl\include;..\;..\..\"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -273,8 +274,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\gsoap-win32-2.8.0;..\zlib123;..\wtl\include;..\;..\..\"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
diff --git a/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcproj b/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcproj
index 1d6a44741..dc3b26cda 100644
--- a/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcproj
+++ b/ext/CrashServer/CrashHandler/DumpUploaderServiceLib/DumpUploaderServiceLib.vcproj
@@ -168,8 +168,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\..\external\gsoap-win32-2.8.0"
 				PreprocessorDefinitions="WIN32;NDEBUG;SOAP_NDEBUG"
 				RuntimeLibrary="0"
@@ -231,8 +232,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\..\external\gsoap-win32-2.8.0"
 				PreprocessorDefinitions="WIN32;NDEBUG;SOAP_NDEBUG"
 				RuntimeLibrary="0"
diff --git a/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcproj b/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcproj
index fb83b7ed2..775d6b0b8 100644
--- a/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcproj
+++ b/ext/CrashServer/CrashHandler/SendRpt/SendRpt.vcproj
@@ -114,8 +114,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="&quot;..\..\external\gsoap-win32-2.8.0&quot;;..\..\external\wtl\include;..\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
@@ -260,8 +261,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
+				Optimization="1"
 				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="&quot;..\..\external\gsoap-win32-2.8.0&quot;;..\..\external\wtl\include;..\"
 				PreprocessorDefinitions="USE64;WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
diff --git a/ext/OGDF/ogdf.vcproj b/ext/OGDF/ogdf.vcproj
index 9029f8ca5..423011419 100644
--- a/ext/OGDF/ogdf.vcproj
+++ b/ext/OGDF/ogdf.vcproj
@@ -108,10 +108,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				WholeProgramOptimization="false"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="./;"
 				PreprocessorDefinitions=""
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -237,10 +240,13 @@
       <Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				WholeProgramOptimization="false"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="./;"
 				PreprocessorDefinitions=""
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/ext/ResizableLib/ResizableLib.vcproj b/ext/ResizableLib/ResizableLib.vcproj
index d60a2600d..30a053348 100644
--- a/ext/ResizableLib/ResizableLib.vcproj
+++ b/ext/ResizableLib/ResizableLib.vcproj
@@ -46,9 +46,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -125,9 +124,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
diff --git a/ext/build/ScintillaLexer.vcproj b/ext/build/ScintillaLexer.vcproj
index 57279cd63..f282c8999 100644
--- a/ext/build/ScintillaLexer.vcproj
+++ b/ext/build/ScintillaLexer.vcproj
@@ -207,6 +207,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -231,6 +232,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\scintilla\include;..\scintilla\src;..\scintilla\lexlib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
@@ -261,7 +264,11 @@
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\scilexer.map"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				OptimizeForWindows98="0"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -296,6 +303,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -320,6 +328,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\scintilla\include;..\scintilla\src;..\scintilla\lexlib"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER;USE_D2D;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
@@ -349,6 +359,10 @@
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
 				MapFileName="$(IntDir)\scilexer.map"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/ext/build/libapr.vcproj b/ext/build/libapr.vcproj
index b5fbd79d8..99ba9fe41 100644
--- a/ext/build/libapr.vcproj
+++ b/ext/build/libapr.vcproj
@@ -26,6 +26,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -51,7 +52,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../apr/include,../apr/include/arch,../apr/include/arch/win32,../apr/include/arch/unix"
 				PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS"
 				StringPooling="true"
@@ -88,6 +90,9 @@
 				ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				BaseAddress="0x6EEC0000"
 				ImportLibrary="$(OutDir)\libapr_tsvn.lib"
 			/>
@@ -125,6 +130,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -150,7 +156,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../apr/include,../apr/include/arch,../apr/include/arch/win32,../apr/include/arch/unix"
 				PreprocessorDefinitions="NDEBUG;APR_DECLARE_EXPORT;WIN32;_WINDOWS;WIN64"
 				StringPooling="true"
@@ -186,6 +193,9 @@
 				ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				BaseAddress="0x6EEC0000"
 				ImportLibrary="$(OutDir)\libapr_tsvn.lib"
 				TargetMachine="17"
diff --git a/ext/build/libaprutil.vcproj b/ext/build/libaprutil.vcproj
index 3a940a9ea..edc5fdb1c 100644
--- a/ext/build/libaprutil.vcproj
+++ b/ext/build/libaprutil.vcproj
@@ -125,6 +125,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -151,7 +152,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../apr-util/include,../apr/include,../apr-util/include/private,../apr-iconv/include,../apr-util/dbm/sdbm,../apr-util/xml/expat/lib"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS"
 				StringPooling="true"
@@ -188,6 +190,9 @@
 				ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				BaseAddress="0x6EE60000"
 				ImportLibrary="$(OutDir)\libaprutil_tsvn.lib"
 			/>
@@ -324,6 +329,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -350,7 +356,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../apr-util/include,../apr/include,../apr-util/include/private,../apr-iconv/include,../apr-util/dbm/sdbm,../apr-util/xml/expat/lib"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;XML_STATIC;WIN32;_WINDOWS"
 				StringPooling="true"
@@ -386,6 +393,9 @@
 				ProgramDatabaseFile="$(OutDir)\libapr_tsvn.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				BaseAddress="0x6EE60000"
 				ImportLibrary="$(OutDir)\libaprutil_tsvn.lib"
 				TargetMachine="17"
diff --git a/ext/build/libcurl.vcproj b/ext/build/libcurl.vcproj
index f273fadf9..278d24895 100644
--- a/ext/build/libcurl.vcproj
+++ b/ext/build/libcurl.vcproj
@@ -178,6 +178,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -203,7 +204,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\libcurl\lib,..\libcurl\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL"
 				StringPooling="true"
@@ -230,7 +232,10 @@
 				AdditionalDependencies="ws2_32.lib wldap32.lib"
 				OutputFile="$(SolutionDir)\..\bin\Release\bin\libcurl32.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				ImportLibrary="$(SolutionDir)\..\bin\Release\bin\libcurl32.lib"
 				TargetMachine="1"
 			/>
@@ -267,6 +272,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -292,7 +298,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\libcurl\lib,..\libcurl\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;BUILDING_LIBCURL;WIN64"
 				StringPooling="true"
@@ -321,7 +328,10 @@
 				AdditionalDependencies="ws2_32.lib wldap32.lib"
 				OutputFile="$(SolutionDir)\..\bin\Release64\bin\libcurl.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				ImportLibrary="$(SolutionDir)\..\bin\Release64\bin\libcurl.lib"
 				TargetMachine="17"
 			/>
@@ -6022,7 +6032,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6032,7 +6042,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6042,7 +6052,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6052,7 +6062,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6062,7 +6072,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6072,7 +6082,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6082,7 +6092,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
@@ -6092,7 +6102,7 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Creating curlbuild.h from curlbuild.h.dist"
-						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h"
+						CommandLine="type ..\libcurl\include\curl\curlbuild.h.dist &gt; ..\libcurl\include\curl\curlbuild.h&#x0D;&#x0A;"
 						Outputs="..\libcurl\include\curl\curlbuild.h"
 					/>
 				</FileConfiguration>
diff --git a/ext/build/libgit2.vcproj b/ext/build/libgit2.vcproj
index 46fc84780..02bbb9cad 100644
--- a/ext/build/libgit2.vcproj
+++ b/ext/build/libgit2.vcproj
@@ -203,6 +203,7 @@
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\http-parser;..\libgit2\deps\regex"
 				PreprocessorDefinitions="NDEBUG;GIT_WINHTTP;WIN32_SHA1"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
@@ -226,7 +227,10 @@
 				OutputFile="$(OutDir)\$(ProjectName)32.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				LinkTimeCodeGeneration="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -279,9 +283,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="..\zlib;..\libgit2\src;..\libgit2\include;..\libgit2\deps\http-parser;..\libgit2\deps\regex"
 				PreprocessorDefinitions="NDEBUG;GIT_WINHTTP;WIN32_SHA1"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
@@ -304,7 +308,10 @@
 				Name="VCLinkerTool"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				LinkTimeCodeGeneration="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/ext/build/xml.vcproj b/ext/build/xml.vcproj
index c2b3ac9cd..851b49534 100644
--- a/ext/build/xml.vcproj
+++ b/ext/build/xml.vcproj
@@ -100,6 +100,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -119,7 +120,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;..\apr-util\xml\expat\lib&quot;;."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				StringPooling="true"
@@ -249,6 +251,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -269,7 +272,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;..\apr-util\xml\expat\lib&quot;;."
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;COMPILED_FROM_DSP;XML_STATIC"
 				StringPooling="true"
diff --git a/ext/build/zlib.vcproj b/ext/build/zlib.vcproj
index 06196511e..5b17e2ae7 100644
--- a/ext/build/zlib.vcproj
+++ b/ext/build/zlib.vcproj
@@ -214,6 +214,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -239,7 +240,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="WIN32;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -270,8 +272,10 @@
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile="..\zlib\win32\zlib.def"
 				ProgramDatabaseFile="$(SolutionDir)\..\bin\Release\bin\zlib132.pdb"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				ImportLibrary="$(SolutionDir)\..\bin\Release\bin\zlib132.lib"
 				TargetMachine="1"
 			/>
@@ -307,6 +311,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -332,7 +337,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;WIN64"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -363,8 +369,10 @@
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile="..\zlib\win32\zlib.def"
 				ProgramDatabaseFile="$(SolutionDir)\..\bin\Release64\bin\zlib1.pdb"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				ImportLibrary="$(SolutionDir)\..\bin\Release64\bin\zlib1.lib"
 				TargetMachine="17"
 			/>
diff --git a/ext/gitdll/gitdll.vcproj b/ext/gitdll/gitdll.vcproj
index 0a5915c6e..ff91201d9 100644
--- a/ext/gitdll/gitdll.vcproj
+++ b/ext/gitdll/gitdll.vcproj
@@ -197,6 +197,7 @@
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;..\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -221,6 +222,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -275,6 +277,7 @@
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\tgit;..\tgit\compat;..\tgit\compat\vcbuild;;..\tgit\compat\vcbuild\include;..\tgit\compat\fnmatch;..\tgit\compat\regex;..\tgit\compat\win32;..\zlib;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GITDLL_EXPORTS;WIN64"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -298,6 +301,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj
index ab3720425..8fe96b8ee 100644
--- a/ext/hunspell/hunspell.vcproj
+++ b/ext/hunspell/hunspell.vcproj
@@ -27,6 +27,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -45,6 +46,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -99,6 +102,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -118,6 +122,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
diff --git a/ext/tgit b/ext/tgit
index ce05fcc3c..9432129dc 160000
--- a/ext/tgit
+++ b/ext/tgit
@@ -1 +1 @@
-Subproject commit ce05fcc3c74dcc483ac439a890d9d684a6a379c4
+Subproject commit 9432129dc88a89e914fdc286079d37550ed6fb3e
diff --git a/src/AsyncFramework/AsyncFramework.vcproj b/src/AsyncFramework/AsyncFramework.vcproj
index 37d1ca2b3..ce2f9331f 100644
--- a/src/AsyncFramework/AsyncFramework.vcproj
+++ b/src/AsyncFramework/AsyncFramework.vcproj
@@ -166,8 +166,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -227,8 +230,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				DebugInformationFormat="3"
diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index 684796612..92b5da3e6 100644
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -156,7 +156,7 @@
 			ConfigurationType="4"
 			UseOfMFC="2"
 			CharacterSet="1"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -175,8 +175,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../TortoiseShell;../utils;../../ext/gitdll;../../ext/libgit2/include;../../ext/zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
@@ -220,7 +223,7 @@
 			ConfigurationType="4"
 			UseOfMFC="2"
 			CharacterSet="1"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -240,8 +243,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../TortoiseShell;../utils;../../ext/gitdll;../../ext/libgit2/include;../../ext/zlib"
 				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
diff --git a/src/IBugTraqProvider/IBugTraqProvider.vcproj b/src/IBugTraqProvider/IBugTraqProvider.vcproj
index 422e02dab..d2833700f 100644
--- a/src/IBugTraqProvider/IBugTraqProvider.vcproj
+++ b/src/IBugTraqProvider/IBugTraqProvider.vcproj
@@ -173,6 +173,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -237,6 +238,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/src/ResText/ResText.vcproj b/src/ResText/ResText.vcproj
index 044c88ca8..aab9bca79 100644
--- a/src/ResText/ResText.vcproj
+++ b/src/ResText/ResText.vcproj
@@ -201,10 +201,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				StringPooling="true"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
@@ -223,13 +224,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="shlwapi.lib"
-				OutputFile="$(OutDir)/ResText.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -280,10 +280,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
 				StringPooling="true"
 				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
@@ -302,12 +303,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="shlwapi.lib"
-				OutputFile="$(OutDir)/ResText.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/SshAskPass/SshAskPass.vcproj b/src/SshAskPass/SshAskPass.vcproj
index 29e181466..337a05b31 100644
--- a/src/SshAskPass/SshAskPass.vcproj
+++ b/src/SshAskPass/SshAskPass.vcproj
@@ -140,6 +140,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -287,6 +288,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TGitCache/TGITCache.vcproj b/src/TGitCache/TGITCache.vcproj
index a6173ab27..57686ae95 100644
--- a/src/TGitCache/TGITCache.vcproj
+++ b/src/TGitCache/TGITCache.vcproj
@@ -218,8 +218,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\ext\gitdll;..\Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include;..\..\ext\libgit2\include;..\..\ext\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
@@ -240,7 +242,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Crypt32.lib"
-				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
 				IgnoreDefaultLibraryNames=""
@@ -249,7 +250,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -301,8 +302,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\ext\gitdll;..\Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include;..\..\ext\libgit2\include;..\..\ext\zlib"
 				PreprocessorDefinitions="WIN64;NDEBUG;_CONSOLE;UNICODE;_UNICODE"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
@@ -323,13 +326,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Crypt32.lib"
-				OutputFile="$(OutDir)/TGitCache.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 2000800c6..dac34bcf5 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -216,8 +216,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="./;../../ext/gitdll;..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources;../TortoiseMerge"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
+				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -248,6 +250,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -303,8 +306,10 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="./;../../ext/gitdll;..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources;../TortoiseMerge"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"
+				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -333,6 +338,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TortoiseGitBlame/TortoiseGitBlameLang.vcproj b/src/TortoiseGitBlame/TortoiseGitBlameLang.vcproj
index 087584330..93eacd52a 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlameLang.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlameLang.vcproj
@@ -62,7 +62,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -70,9 +69,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -142,7 +140,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -150,9 +147,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -221,7 +217,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -301,7 +296,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
diff --git a/src/TortoiseIDiff/TortoiseIDiff.vcproj b/src/TortoiseIDiff/TortoiseIDiff.vcproj
index e8f21bf71..ae2fe91a8 100644
--- a/src/TortoiseIDiff/TortoiseIDiff.vcproj
+++ b/src/TortoiseIDiff/TortoiseIDiff.vcproj
@@ -200,14 +200,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				FavorSizeOrSpeed="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\Utils;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="true"
-				EnableEnhancedInstructionSet="0"
+				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
@@ -232,6 +231,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -282,11 +282,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				FavorSizeOrSpeed="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\Utils;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -310,6 +311,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TortoiseIDiff/TortoiseIDiffLang.vcproj b/src/TortoiseIDiff/TortoiseIDiffLang.vcproj
index 742476104..78ca94b29 100644
--- a/src/TortoiseIDiff/TortoiseIDiffLang.vcproj
+++ b/src/TortoiseIDiff/TortoiseIDiffLang.vcproj
@@ -62,7 +62,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -70,8 +69,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="1"
 			/>
@@ -142,7 +141,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -150,8 +148,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="17"
 			/>
@@ -221,7 +219,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -301,7 +298,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
diff --git a/src/TortoiseMerge/TortoiseMerge.vcproj b/src/TortoiseMerge/TortoiseMerge.vcproj
index cb80bd8d9..a9afbcfa9 100644
--- a/src/TortoiseMerge/TortoiseMerge.vcproj
+++ b/src/TortoiseMerge/TortoiseMerge.vcproj
@@ -216,12 +216,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="2"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;..\..\ext\apr-util\include;.\libsvn_diff;..\Utils;..\crashrpt;..\;..\Utils\MiscUI;../../ext/ResizableLib"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
+				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
@@ -249,6 +251,7 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				OptimizeForWindows98="0"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -303,12 +306,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="2"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\TortoiseMerge;..\..\ext\gitdll;..\git;.\svninclude;..\..\ext\apr\include;&quot;..\..\ext\apr-util\include&quot;;.\libsvn_diff;..\Utils;..\crashrpt;..\;..\Utils\MiscUI;../../ext/ResizableLib"
 				PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
+				StringPooling="true"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
@@ -335,6 +340,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TortoiseMerge/TortoiseMergeLang.vcproj b/src/TortoiseMerge/TortoiseMergeLang.vcproj
index 467102625..28728432c 100644
--- a/src/TortoiseMerge/TortoiseMergeLang.vcproj
+++ b/src/TortoiseMerge/TortoiseMergeLang.vcproj
@@ -63,7 +63,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -71,8 +70,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="1"
 			/>
@@ -143,7 +142,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -151,8 +149,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="17"
 			/>
@@ -223,7 +221,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -303,7 +300,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -311,6 +307,7 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="false"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
index c00852252..6d47ce6cb 100644
--- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
+++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
@@ -26,6 +26,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -50,6 +51,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\..\..\./,..\..\..\charset/,..\..\..\windows/,..\..\..\unix/,..\..\..\mac/,..\..\..\macosx/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32"
 				StringPooling="true"
@@ -69,7 +72,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
+				Culture="1033"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -77,15 +80,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib imm32.lib winmm.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="2"
-				OptimizeForWindows98="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				OptimizeReferences="1"
+				EnableCOMDATFolding="1"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -120,6 +122,7 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -144,6 +147,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="..\..\..\./,..\..\..\charset/,..\..\..\windows/,..\..\..\unix/,..\..\..\mac/,..\..\..\macosx/"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;SECURITY_WIN32"
 				StringPooling="true"
@@ -162,7 +167,7 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
+				Culture="1033"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -170,14 +175,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib imm32.lib winmm.lib"
-				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index d8184919e..cad702f64 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -226,12 +226,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;..\Utils;..\crashrpt;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
@@ -263,9 +265,8 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				TargetMachine="1"
-				Profile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -319,12 +320,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\TortoiseProc;..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;..\Utils;..\crashrpt;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\MiscUI;..\TortoiseShell;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;..\..\ext\OGDF;..\AsyncFramework"
 				PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;THESAURUS"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="2"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
@@ -355,6 +358,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/TortoiseProc/TortoiseProcLang.vcproj b/src/TortoiseProc/TortoiseProcLang.vcproj
index 7975d7511..68a68814b 100644
--- a/src/TortoiseProc/TortoiseProcLang.vcproj
+++ b/src/TortoiseProc/TortoiseProcLang.vcproj
@@ -62,7 +62,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -70,8 +69,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="1"
 			/>
@@ -142,7 +141,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="false"
@@ -150,8 +148,8 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ResourceOnlyDLL="true"
+				SetChecksum="true"
 				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"
 				TargetMachine="17"
 			/>
@@ -591,11 +589,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\TortoiseProcENG.rc"
+				RelativePath="..\Resources\tortoisegit_logoflipped.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\tortoisegit_logoflipped.bmp"
+				RelativePath="..\Resources\TortoiseProcENG.rc"
 				>
 			</File>
 			<File
@@ -616,19 +614,19 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\Resources\bin167.avi"
+			RelativePath="..\Languages\res\bin167.avi"
 			>
 		</File>
 		<File
-			RelativePath="..\Languages\res\bin167.avi"
+			RelativePath="..\Resources\bin167.avi"
 			>
 		</File>
 		<File
-			RelativePath="..\Resources\bin168.avi"
+			RelativePath="..\Languages\res\bin168.avi"
 			>
 		</File>
 		<File
-			RelativePath="..\Languages\res\bin168.avi"
+			RelativePath="..\Resources\bin168.avi"
 			>
 		</File>
 		<File
@@ -644,7 +642,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\Languages\res\TortoiseProc.manifest"
+			RelativePath="..\Resources\TortoiseProc.manifest"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
@@ -680,7 +678,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Resources\TortoiseProc.manifest"
+			RelativePath="..\Languages\res\TortoiseProc.manifest"
 			>
 			<FileConfiguration
 				Name="Release|Win32"
diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index 6c969fab5..09736cbf2 100644
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -259,11 +259,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\..\ext\gitdll;..\Git;..\Utils;..\TortoiseShell;..\Utils\MiscUI;..\..\ext\libgit2\include;..\..\ext\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="false"
+				EnableFunctionLevelLinking="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
 				AssemblerListingLocation="..\..\obj\TortoiseShell\Release/"
@@ -288,7 +290,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="Crypt32.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				OutputFile="$(OutDir)/TortoiseGit32.dll"
 				LinkIncremental="1"
@@ -298,11 +299,10 @@
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				BaseAddress="0x5960000"
 				ImportLibrary="..\..\obj\TortoiseShell\Release/TortoiseGit.lib"
 				TargetMachine="1"
@@ -362,11 +362,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\..\ext\gitdll;..\Git;..\Utils;..\TortoiseShell;..\Utils\MiscUI;..\..\ext\libgit2\include;..\..\ext\zlib"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL"
 				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="false"
+				EnableFunctionLevelLinking="true"
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="2"
 				AssemblerListingLocation="..\..\obj\TortoiseShell\Release64/"
@@ -399,10 +401,10 @@
 				ModuleDefinitionFile=".\ShellExt.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/TortoiseShell.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				BaseAddress="0x5960000"
 				ImportLibrary="..\..\obj\TortoiseShell\Release64/TortoiseGit.lib"
 				TargetMachine="17"
diff --git a/src/TortoiseShell/TortoiseStub.vcproj b/src/TortoiseShell/TortoiseStub.vcproj
index 3df010ccc..ace859f5a 100644
--- a/src/TortoiseShell/TortoiseStub.vcproj
+++ b/src/TortoiseShell/TortoiseStub.vcproj
@@ -239,17 +239,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../Utils"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_CRT_VERSION"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				StructMemberAlignment="0"
-				EnableFunctionLevelLinking="false"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
 				AssemblerListingLocation="..\..\obj\TortoiseStub\Release/"
 				ObjectFile="..\..\obj\TortoiseStub\Release/"
@@ -277,11 +275,10 @@
 				ModuleDefinitionFile=".\TortoiseStub.def"
 				ProgramDatabaseFile="$(OutDir)/TortoiseStub.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				BaseAddress="0x5940000"
-				RandomizedBaseAddress="2"
-				DataExecutionPrevention="0"
 				ImportLibrary="..\..\obj\TortoiseStub\Release/TortoiseStub.lib"
 				TargetMachine="1"
 			/>
@@ -342,17 +339,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="0"
-				FavorSizeOrSpeed="2"
-				WholeProgramOptimization="true"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="../Utils"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_BIND_TO_CURRENT_CRT_VERSION"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				StructMemberAlignment="0"
-				EnableFunctionLevelLinking="false"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
 				AssemblerListingLocation="..\..\obj\TortoiseStub\Release64/"
 				ObjectFile="..\..\obj\TortoiseStub\Release64/"
@@ -374,16 +369,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/TortoiseGitStub.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				ModuleDefinitionFile=".\TortoiseStub.def"
 				ProgramDatabaseFile="$(OutDir)/TortoiseStub.pdb"
 				SubSystem="2"
+				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				BaseAddress="0x5940000"
-				RandomizedBaseAddress="2"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\obj\TortoiseStub\Release64/TortoiseStub.lib"
 				TargetMachine="17"
diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcproj b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index a0c259f2f..59dbed15a 100644
--- a/src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/src/TortoiseUDiff/TortoiseUDiff.vcproj
@@ -198,9 +198,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
 				DebugInformationFormat="3"
@@ -223,7 +226,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -275,9 +278,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"
 				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"
+				StringPooling="true"
 				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
 				DebugInformationFormat="3"
@@ -299,6 +305,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
diff --git a/src/Utils/Utils.vcproj b/src/Utils/Utils.vcproj
index b3e20a4bd..8e0ab58e4 100644
--- a/src/Utils/Utils.vcproj
+++ b/src/Utils/Utils.vcproj
@@ -156,7 +156,7 @@
 			ConfigurationType="4"
 			UseOfMFC="2"
 			CharacterSet="1"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -175,8 +175,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../ext/gitdll;../git;../;../ext/scintilla/include;../ext/hunspell;./;./MiscUi"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
@@ -219,7 +222,7 @@
 			ConfigurationType="4"
 			UseOfMFC="2"
 			CharacterSet="1"
-			WholeProgramOptimization="0"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -239,8 +242,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				EnableIntrinsicFunctions="true"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="../../ext/gitdll;../git;../;../ext/scintilla/include;../ext/hunspell;./;./MiscUi"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
+				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
diff --git a/src/touch/touch.vcproj b/src/touch/touch.vcproj
index cff964345..b22d8e50f 100644
--- a/src/touch/touch.vcproj
+++ b/src/touch/touch.vcproj
@@ -140,6 +140,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -287,6 +288,7 @@
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				SetChecksum="true"
 				TargetMachine="17"
 			/>
 			<Tool
-- 
2.11.4.GIT