diff --git a/Externals/wxWidgets/build/msw/wx_aui.vcproj b/Externals/wxWidgets/build/msw/wx_aui.vcproj
index 238723126e..e00bf493a4 100644
--- a/Externals/wxWidgets/build/msw/wx_aui.vcproj
+++ b/Externals/wxWidgets/build/msw/wx_aui.vcproj
@@ -10,14 +10,17 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="DLL Universal Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswunivddll\aui"
+			Name="DLL Universal Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -40,7 +43,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -87,7 +90,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv28d_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -114,9 +117,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Unicode Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswunivuddll\aui"
+			Name="DLL Universal Unicode Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -140,7 +143,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,_DEBUG,__WXMSW__,__WXUNIVERSAL__,__WXDEBUG__,_UNICODE,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -187,7 +190,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv28ud_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -214,9 +217,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Unicode Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswunivudll\aui"
+			Name="DLL Universal Unicode Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -240,7 +243,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,__WXMSW__,__WXUNIVERSAL__,_UNICODE,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -287,7 +290,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv28u_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -314,9 +317,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib\Win32"
-			IntermediateDirectory=".\vc_mswud\aui"
+			Name="Unicode Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -337,6 +340,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -391,9 +395,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswddll\aui"
+			Name="DLL Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -416,7 +420,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,_DEBUG,__WXMSW__,__WXDEBUG__,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -463,7 +467,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw28d_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -490,9 +494,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswdll\aui"
+			Name="DLL Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -515,7 +519,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,__WXMSW__,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -562,7 +566,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw28_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -589,9 +593,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Unicode Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswuddll\aui"
+			Name="DLL Unicode Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -615,7 +619,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,_DEBUG,__WXMSW__,__WXDEBUG__,_UNICODE,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -662,7 +666,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw28ud_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -689,9 +693,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib"
-			IntermediateDirectory=".\vc_mswunivd\aui"
+			Name="Universal Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -711,6 +715,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -765,9 +770,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Unicode Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswudll\aui"
+			Name="DLL Unicode Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -791,7 +796,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,__WXMSW__,_UNICODE,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -838,7 +843,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmsw28u_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -865,9 +870,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib"
-			IntermediateDirectory=".\vc_mswuniv\aui"
+			Name="Universal Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -887,6 +892,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -942,9 +948,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Unicode Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib"
-			IntermediateDirectory=".\vc_mswunivud\aui"
+			Name="Universal Unicode Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -965,6 +971,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -1074,7 +1081,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\lib\vc_lib\Win32\wxmsw28ud_aui.lib"
+				OutputFile="$(OutDir)\wxmsw28ud_aui.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@@ -1096,9 +1103,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Universal Unicode Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib"
-			IntermediateDirectory=".\vc_mswunivu\aui"
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\lib\vc_lib\x64"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -1119,6 +1126,85 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHsc "
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\mswd,..\..\include,..\..\src\tiff,..\..\src\jpeg,..\..\src\png,..\..\src\zlib,..\..\src\regex,..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__"
+				MinimalRebuild="true"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="wx/wxprec.h"
+				PrecompiledHeaderFile="vc_mswd\wxprec_auilib.pch"
+				AssemblerListingLocation=".\vc_mswd\aui/"
+				ObjectFile=".\vc_mswd\aui/"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw28d_aui.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\wxmsw28ud_aui.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\..\..\lib\vc_lib/wx_aui.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Universal Unicode Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -1174,9 +1260,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib"
-			IntermediateDirectory=".\vc_mswu\aui"
+			Name="Unicode Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -1197,6 +1283,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -1330,9 +1417,88 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DLL Universal Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_dll"
-			IntermediateDirectory=".\vc_mswunivdll\aui"
+			Name="Release|x64"
+			OutputDirectory=".\..\..\lib\vc_lib\x64"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/EHsc "
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\lib\vc_lib\msw,..\..\include,..\..\src\tiff,..\..\src\jpeg,..\..\src\png,..\..\src\zlib,..\..\src\regex,..\..\src\expat\lib"
+				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="wx/wxprec.h"
+				PrecompiledHeaderFile="vc_msw\wxprec_auilib.pch"
+				AssemblerListingLocation=".\vc_msw\aui/"
+				ObjectFile=".\vc_msw\aui/"
+				ProgramDataBaseFileName="..\..\lib\vc_lib\wxmsw28_aui.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\wxmsw28u_aui.lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\..\..\lib\vc_lib/wx_aui.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="DLL Universal Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -1355,7 +1521,7 @@
 				PreprocessorDefinitions="WIN32,_USRDLL,DLL_EXPORTS,__WXMSW__,__WXUNIVERSAL__,WXUSINGDLL,WXMAKINGDLL_AUI"
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
-				TargetEnvironment="1"
+				TargetEnvironment="3"
 				TypeLibraryName=".\..\..\lib\vc_dll/wx_aui.tlb"
 				HeaderFileName=""
 			/>
@@ -1402,7 +1568,7 @@
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				ImportLibrary="..\..\lib\vc_dll\wxmswuniv28_aui.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -1439,7 +1605,7 @@
 				RelativePath="..\..\src\common\dummy.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1449,7 +1615,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1459,7 +1625,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1469,7 +1635,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1479,7 +1645,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1489,7 +1655,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1499,7 +1665,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1509,7 +1675,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1519,7 +1685,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1529,7 +1695,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1539,7 +1705,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1559,7 +1725,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1569,7 +1735,17 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1589,7 +1765,17 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1607,7 +1793,7 @@
 				RelativePath="..\..\src\msw\version.rc"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1616,7 +1802,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1625,7 +1811,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1634,7 +1820,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1643,7 +1829,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1652,7 +1838,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1661,7 +1847,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1670,7 +1856,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1679,7 +1865,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1688,7 +1874,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1697,7 +1883,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1715,7 +1901,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1724,7 +1910,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						AdditionalIncludeDirectories="\Work\Personal\Programming\C++\wxWidgets\Versions\wxMSW-2.8.10\src\msw"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1742,7 +1937,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						AdditionalIncludeDirectories="\Work\Personal\Programming\C++\wxWidgets\Versions\wxMSW-2.8.10\src\msw"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCResourceCompilerTool"
@@ -1759,7 +1963,7 @@
 				RelativePath="..\..\include\wx\univ\setup.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1769,7 +1973,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1779,7 +1983,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1789,7 +1993,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1799,7 +2003,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1809,7 +2013,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1819,7 +2023,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1829,7 +2033,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1843,7 +2047,7 @@
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1853,7 +2057,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1863,7 +2067,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1873,7 +2077,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1883,7 +2087,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1903,7 +2107,17 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_lib\mswd\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\mswd\wx\setup.h&#x0D;&#x0A;"
+						Outputs="..\..\lib\vc_lib\mswd\wx\setup.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1922,6 +2136,16 @@
 						Outputs="..\..\lib\vc_lib\msw\wx\setup.h"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_lib\msw\wx\setup.h"
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\lib\vc_lib\msw\wx\setup.h&#x0D;&#x0A;"
+						Outputs="..\..\lib\vc_lib\msw\wx\setup.h"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -1931,7 +2155,7 @@
 				RelativePath="..\..\include\wx\msw\genrcdefs.h"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1941,7 +2165,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1951,7 +2175,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1961,7 +2185,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1971,7 +2195,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1981,7 +2205,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1991,7 +2215,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2001,7 +2225,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2011,7 +2235,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2021,7 +2245,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2031,7 +2255,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2051,7 +2275,17 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
+						Outputs="..\..\lib\vc_lib\mswd\wx\msw\rcdefs.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2061,7 +2295,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2081,7 +2315,17 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Creating ..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+						CommandLine="cl /EP /nologo &quot;$(InputPath)&quot; &gt; &quot;..\..\lib\vc_lib\msw\wx\msw\rcdefs.h&quot;&#x0D;&#x0A;"
+						Outputs="..\..\lib\vc_lib\msw\wx\msw\rcdefs.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2131,7 +2375,7 @@
 				RelativePath="..\..\src\aui\auibar.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2140,7 +2384,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2149,7 +2393,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2158,7 +2402,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2167,7 +2411,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2176,7 +2420,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2185,7 +2429,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2194,7 +2438,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2203,7 +2447,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2212,7 +2456,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2221,7 +2465,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2239,7 +2483,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2248,7 +2492,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2266,7 +2519,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2279,7 +2541,7 @@
 				RelativePath="..\..\src\aui\auibook.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2288,7 +2550,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2297,7 +2559,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2306,7 +2568,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2315,7 +2577,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2324,7 +2586,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2333,7 +2595,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2342,7 +2604,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2351,7 +2613,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2360,7 +2622,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2369,7 +2631,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2387,7 +2649,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2396,7 +2658,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2414,7 +2685,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2427,7 +2707,7 @@
 				RelativePath="..\..\src\aui\dockart.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2436,7 +2716,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2445,7 +2725,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2454,7 +2734,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2463,7 +2743,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2472,7 +2752,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2481,7 +2761,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2490,7 +2770,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2499,7 +2779,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2508,7 +2788,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2517,7 +2797,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2535,7 +2815,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2544,7 +2824,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2562,7 +2851,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2575,7 +2873,7 @@
 				RelativePath="..\..\src\aui\floatpane.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2584,7 +2882,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2593,7 +2891,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2602,7 +2900,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2611,7 +2909,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2620,7 +2918,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2629,7 +2927,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2638,7 +2936,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2647,7 +2945,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2656,7 +2954,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2665,7 +2963,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2683,7 +2981,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2692,7 +2990,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2710,7 +3017,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2723,7 +3039,7 @@
 				RelativePath="..\..\src\aui\framemanager.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2732,7 +3048,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2741,7 +3057,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2750,7 +3066,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2759,7 +3075,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2768,7 +3084,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2777,7 +3093,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2786,7 +3102,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2795,7 +3111,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2804,7 +3120,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2813,7 +3129,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2831,7 +3147,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2840,7 +3156,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2858,7 +3183,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2871,7 +3205,7 @@
 				RelativePath="..\..\src\aui\tabmdi.cpp"
 				>
 				<FileConfiguration
-					Name="DLL Universal Debug|Win32"
+					Name="DLL Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2880,7 +3214,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Debug|Win32"
+					Name="DLL Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2889,7 +3223,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Unicode Release|Win32"
+					Name="DLL Universal Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2898,7 +3232,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Debug|Win32"
+					Name="Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2907,7 +3241,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Debug|Win32"
+					Name="DLL Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2916,7 +3250,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Release|Win32"
+					Name="DLL Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2925,7 +3259,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Debug|Win32"
+					Name="DLL Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2934,7 +3268,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Debug|Win32"
+					Name="Universal Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2943,7 +3277,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Unicode Release|Win32"
+					Name="DLL Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2952,7 +3286,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Release|Win32"
+					Name="Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2961,7 +3295,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Debug|Win32"
+					Name="Universal Unicode Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2979,7 +3313,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Universal Unicode Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -2988,7 +3322,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Unicode Release|Win32"
+					Name="Universal Unicode Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Unicode Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -3006,7 +3349,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="DLL Universal Release|Win32"
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DLL Universal Release|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
diff --git a/Source/Externals.sln b/Source/Externals.sln
index eaf9a9f7c6..841de36b5a 100644
--- a/Source/Externals.sln
+++ b/Source/Externals.sln
@@ -138,7 +138,8 @@ Global
 		{33546D62-7F34-4EA6-A88E-D538B36E16BF}.Release|x64.Build.0 = Release|x64
 		{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|Win32.ActiveCfg = Debug|Win32
 		{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|Win32.Build.0 = Debug|Win32
-		{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.ActiveCfg = Debug|Win32
+		{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.ActiveCfg = Debug|x64
+		{05C75041-D67D-4903-A362-8395A7B35C75}.Debug|x64.Build.0 = Debug|x64
 		{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.ActiveCfg = Debug|Win32
 		{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|Win32.Build.0 = Debug|Win32
 		{05C75041-D67D-4903-A362-8395A7B35C75}.DebugFast|x64.ActiveCfg = Debug|Win32