VS solution: Added combined Dolphin and externals solution

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4091 8ced0084-cf51-0410-be5f-012b33b47a6e
2025-07-23 14:19:46 -06:00 · 2009-08-29 07:12:34 +00:00
parent 508051ec8d
commit 505a269c7f
6 changed files with 761 additions and 4159 deletions
--- a/Externals/wxWidgets/build/msw/wx_adv.vcproj
+++ b/Externals/wxWidgets/build/msw/wx_adv.vcproj
@ -18,88 +18,10 @@
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="DebugFast|x64"
-			OutputDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="wxAdv28_$(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"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
-				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				MinimalRebuild="true"
-				RuntimeLibrary="0"
-				RuntimeTypeInfo="true"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="wx/wxprec.h"
-				PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\vc80.pdb"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4267"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\wxmsw28u_adv.lib"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\..\..\lib\vc_lib/wx_adv.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
-			IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswud\adv\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -174,8 +96,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
-			IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswud\adv\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -254,8 +176,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\Win32"
-			IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswu\adv\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -331,8 +253,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="wxAdv28_$(PlatformName)\..\..\..\lib\vc_lib\x64"
-			IntermediateDirectory="wxAdv28_$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswu\adv\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -418,15 +340,6 @@
 			<File
 				RelativePath="..\..\src\common\animatecmn.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -467,15 +380,6 @@
 			<File
 				RelativePath="..\..\src\common\datavcmn.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -516,16 +420,6 @@
 			<File
 				RelativePath="..\..\src\common\dummy.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -570,15 +464,6 @@
 			<File
 				RelativePath="..\..\src\common\taskbarcmn.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -623,15 +508,6 @@
 			<File
 				RelativePath="..\..\src\msw\aboutdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -672,15 +548,6 @@
 			<File
 				RelativePath="..\..\src\msw\datectrl.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -721,15 +588,6 @@
 			<File
 				RelativePath="..\..\src\msw\joystick.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -770,15 +628,6 @@
 			<File
 				RelativePath="..\..\src\msw\sound.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -819,15 +668,6 @@
 			<File
 				RelativePath="..\..\src\msw\taskbar.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -868,15 +708,6 @@
 			<File
 				RelativePath="..\..\src\msw\version.rc"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\Emulation\SCMs\dolphin\Externals\wxWidgets\src\msw"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
@ -921,15 +752,6 @@
 			<File
 				RelativePath="..\..\src\generic\aboutdlgg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -970,15 +792,6 @@
 			<File
 				RelativePath="..\..\src\generic\animateg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1019,15 +832,6 @@
 			<File
 				RelativePath="..\..\src\generic\bmpcboxg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1068,15 +872,6 @@
 			<File
 				RelativePath="..\..\src\generic\calctrl.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1117,15 +912,6 @@
 			<File
 				RelativePath="..\..\src\generic\datavgen.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1166,15 +952,6 @@
 			<File
 				RelativePath="..\..\src\generic\datectlg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1215,15 +992,6 @@
 			<File
 				RelativePath="..\..\src\generic\grid.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1264,15 +1032,6 @@
 			<File
 				RelativePath="..\..\src\generic\gridctrl.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1313,15 +1072,6 @@
 			<File
 				RelativePath="..\..\src\generic\gridsel.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1362,15 +1112,6 @@
 			<File
 				RelativePath="..\..\src\generic\helpext.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1411,15 +1152,6 @@
 			<File
 				RelativePath="..\..\src\generic\hyperlink.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1460,15 +1192,6 @@
 			<File
 				RelativePath="..\..\src\generic\laywin.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1509,15 +1232,6 @@
 			<File
 				RelativePath="..\..\src\generic\odcombo.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1558,15 +1272,6 @@
 			<File
 				RelativePath="..\..\src\generic\propdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1607,15 +1312,6 @@
 			<File
 				RelativePath="..\..\src\generic\sashwin.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1656,15 +1352,6 @@
 			<File
 				RelativePath="..\..\src\generic\splash.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1705,15 +1392,6 @@
 			<File
 				RelativePath="..\..\src\generic\tipdlg.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1754,15 +1432,6 @@
 			<File
 				RelativePath="..\..\src\generic\wizard.cpp"
 				>
-				<FileConfiguration
-					Name="DebugFast|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@ -1804,19 +1473,13 @@
 		<Filter
 			Name="Setup Headers"
 			>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
-				<FileConfiguration
-					Name="DebugFast|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="Debug|Win32"
 					>
@ -1858,10 +1521,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="MSW Headers"
@ -1873,16 +1532,6 @@
 			<File
 				RelativePath="..\..\include\wx\msw\genrcdefs.h"
 				>
-				<FileConfiguration
-					Name="DebugFast|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="Debug|Win32"
 					>
--- a/Externals/wxWidgets/build/msw/wx_aui.vcproj
+++ b/Externals/wxWidgets/build/msw/wx_aui.vcproj
@ -19,8 +19,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib\Win32"
-			IntermediateDirectory=".\vc_mswd\aui"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswud\aui\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -54,9 +54,9 @@
 				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"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\wxmsw28d_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@ -96,8 +96,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\..\..\lib\vc_lib\x64"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswud\aui\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -132,9 +132,9 @@
 				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"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\wxmsw28d_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@ -174,8 +174,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\lib\vc_lib\Win32"
-			IntermediateDirectory=".\vc_msw\aui"
+			OutputDirectory="..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswu\aui\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -210,10 +210,10 @@
 				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"
+				PrecompiledHeaderFile="$(IntDir)\wxprec_auilib.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\wxmsw28_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 			/>
@ -252,8 +252,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\..\..\lib\vc_lib\x64"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\..\..\lib\vc_lib\$(PlatformName)"
+			IntermediateDirectory="vc_mswu\aui\$(PlatformName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@ -290,9 +290,9 @@
 				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"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\wxmsw28_aui.pdb"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
 			/>
@ -428,10 +428,6 @@
 		<Filter
 			Name="Setup Headers"
 			>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
@ -476,6 +472,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="MSW Headers"
--- a/Externals/wxWidgets/build/msw/wx_base.vcproj
+++ b/Externals/wxWidgets/build/msw/wx_base.vcproj
--- a/Externals/wxWidgets/build/msw/wx_core.vcproj
+++ b/Externals/wxWidgets/build/msw/wx_core.vcproj